Update the user data export archive format.

Gemfile

@@ -13,7 +13,8 @@ gem "unicorn-worker-killer", "0.4.4"
 
 # Federation
 
-gem "diaspora_federation-rails", "0.2.0"
+gem "diaspora_federation-json_schema", "0.2.1"
+gem "diaspora_federation-rails", "0.2.1"
 
 # API and JSON
 
@@ -277,6 +278,8 @@ group :test do
 
   gem "fixture_builder",   "0.5.0"
   gem "fuubar",            "2.2.0"
+  gem "json-schema-rspec", "0.0.4"
+  gem "rspec-json_expectations", "~> 2.1"
   gem "test_after_commit", "1.1.0"
 
   # Cucumber (integration tests)
@@ -294,7 +297,7 @@ group :test do
   gem "timecop",            "0.9.1"
   gem "webmock",            "3.0.1", require: false
 
-  gem "diaspora_federation-test", "0.2.0"
+  gem "diaspora_federation-test", "0.2.1"
 
   # Coverage
   gem 'coveralls', require: false

Gemfile.lock

@@ -162,17 +162,18 @@ GEM
       devise
       rails (>= 3.0.4)
     diaspora-prosody-config (0.0.7)
-    diaspora_federation (0.2.0)
+    diaspora_federation (0.2.1)
       faraday (>= 0.9.0, < 0.13.0)
-      faraday_middleware (>= 0.10.0, < 0.12.0)
+      faraday_middleware (>= 0.10.0, < 0.13.0)
       nokogiri (~> 1.6, >= 1.6.8)
       typhoeus (~> 1.0)
       valid (~> 1.0)
-    diaspora_federation-rails (0.2.0)
+    diaspora_federation-json_schema (0.2.1)
+    diaspora_federation-rails (0.2.1)
       actionpack (>= 4.2, < 6)
-      diaspora_federation (= 0.2.0)
-    diaspora_federation-test (0.2.0)
-      diaspora_federation (= 0.2.0)
+      diaspora_federation (= 0.2.1)
+    diaspora_federation-test (0.2.1)
+      diaspora_federation (= 0.2.1)
       fabrication (~> 2.16.0)
       uuid (~> 2.3.8)
     diff-lcs (1.3)
@@ -199,7 +200,7 @@ GEM
       sigar (~> 0.7.3)
       state_machines
       thor
-    fabrication (2.16.1)
+    fabrication (2.16.2)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.8.0)
@@ -334,6 +335,9 @@ GEM
       url_safe_base64
     json-schema (2.8.0)
       addressable (>= 2.4)
+    json-schema-rspec (0.0.4)
+      json-schema (~> 2.5)
+      rspec
     jsonpath (0.8.5)
       multi_json
     jwt (1.5.6)
@@ -582,6 +586,7 @@ GEM
     rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
+    rspec-json_expectations (2.1.0)
     rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
@@ -772,8 +777,9 @@ DEPENDENCIES
   devise (= 4.3.0)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)
-  diaspora_federation-rails (= 0.2.0)
-  diaspora_federation-test (= 0.2.0)
+  diaspora_federation-json_schema (= 0.2.1)
+  diaspora_federation-rails (= 0.2.1)
+  diaspora_federation-test (= 0.2.1)
   entypo-rails (= 3.0.0)
   eye (= 0.9.2)
   factory_girl_rails (= 4.8.0)
@@ -800,6 +806,7 @@ DEPENDENCIES
   js_image_paths (= 0.1.0)
   json (= 2.1.0)
   json-schema (= 2.8.0)
+  json-schema-rspec (= 0.0.4)
   leaflet-rails (= 1.1.0)
   logging-rails (= 0.6.0)
   markerb (= 1.1.0)
@@ -858,6 +865,7 @@ DEPENDENCIES
   rb-inotify (= 0.9.10)
   redcarpet (= 3.4.0)
   responders (= 2.4.0)
+  rspec-json_expectations (~> 2.1)
   rspec-rails (= 3.6.0)
   rubocop (= 0.49.1)
   ruby-oembed (= 0.12.0)

app/models/person.rb

@@ -37,7 +37,9 @@ def downcase_diaspora_handle
   has_many :posts, :foreign_key => :author_id, :dependent => :destroy # This person's own posts
   has_many :photos, :foreign_key => :author_id, :dependent => :destroy # This person's own photos
   has_many :comments, :foreign_key => :author_id, :dependent => :destroy # This person's own comments
+  has_many :likes, foreign_key: :author_id, dependent: :destroy # This person's own likes
   has_many :participations, :foreign_key => :author_id, :dependent => :destroy
+  has_many :poll_participations, foreign_key: :author_id, dependent: :destroy
   has_many :conversation_visibilities
 
   has_many :roles
@@ -76,8 +78,8 @@ def downcase_diaspora_handle
 
   #not defensive
   scope :in_aspects, ->(aspect_ids) {
-    joins(:contacts => :aspect_memberships).
-        where(:aspect_memberships => {:aspect_id => aspect_ids})
+    joins(contacts: :aspect_memberships)
+      .where(aspect_memberships: {aspect_id: aspect_ids}).distinct
   }
 
   scope :profile_tagged_with, ->(tag_name) {

app/models/poll_participation.rb

@@ -6,6 +6,7 @@ class PollParticipation < ActiveRecord::Base
 
   belongs_to :poll
   belongs_to :poll_answer, counter_cache: :vote_count
+  has_one :status_message, through: :poll
 
   has_one :signature, class_name: "PollParticipationSignature", dependent: :delete
 

app/models/post.rb

@@ -54,6 +54,17 @@ class Post < ActiveRecord::Base
     joins(:likes).where(:likes => {:author_id => person.id})
   }
 
+  scope :subscribed_by, ->(user) {
+    joins(:participations).where(participations: {author_id: user.person_id})
+  }
+
+  scope :reshares, -> { where(type: "Reshare") }
+
+  scope :reshared_by, ->(person) {
+    # we join on the same table, Rails renames "posts" to "reshares_posts" for the right table
+    joins(:reshares).where(reshares_posts: {author_id: person.id})
+  }
+
   def post_type
     self.class.name
   end

app/models/status_message.rb

@@ -19,6 +19,7 @@ class StatusMessage < Post
 
   has_one :location
   has_one :poll, autosave: true
+  has_many :poll_participations, through: :poll
 
   attr_accessor :oembed_url
   attr_accessor :open_graph_url

app/serializers/export/contact_serializer.rb

@@ -2,11 +2,33 @@ module Export
   class ContactSerializer < ActiveModel::Serializer
     attributes :sharing,
                :receiving,
+               :following,
+               :followed,
                :person_guid,
                :person_name,
-               :person_first_name,
-               :person_diaspora_handle
+               :account_id,
+               :public_key
 
-    has_many :aspects, each_serializer: Export::AspectSerializer
+    has_many :contact_groups_membership
+
+    def following
+      object.sharing
+    end
+
+    def followed
+      object.receiving
+    end
+
+    def account_id
+      object.person_diaspora_handle
+    end
+
+    def contact_groups_membership
+      object.aspects.map(&:name)
+    end
+
+    def public_key
+      object.person.serialized_public_key
+    end
   end
 end

app/serializers/export/others_data_serializer.rb

@@ -0,0 +1,34 @@
+module Export
+  class OthersDataSerializer < ActiveModel::Serializer
+    # Relayables of other people in the archive: comments, likes, participations, poll participations where author is
+    # the archive owner
+    has_many :relayables, each_serializer: FederationEntitySerializer
+
+    # Parent posts of user's own relayables. We have to save metadata to use
+    # it in case when posts temporary unavailable on the target pod.
+    has_many :posts, each_serializer: FederationEntitySerializer
+
+    # Authors of posts where we participated and authors are not in contacts
+    has_many :non_contact_authors, each_serializer: PersonMetadataSerializer
+
+    private
+
+    def relayables
+      %i[comments likes poll_participations].map {|relayable|
+        others_relayables.send(relayable)
+      }.sum
+    end
+
+    def others_relayables
+      @others_relayables ||= Diaspora::Exporter::OthersRelayables.new(object.person_id)
+    end
+
+    def posts
+      @posts ||= Diaspora::Exporter::PostsWithActivity.new(object).query
+    end
+
+    def non_contact_authors
+      Diaspora::Exporter::NonContactAuthors.new(posts, object).query
+    end
+  end
+end

app/serializers/export/own_post_serializer.rb

@@ -0,0 +1,33 @@
+module Export
+  # This is a serializer for the user's own posts
+  class OwnPostSerializer < FederationEntitySerializer
+    # Only for public posts.
+    # Includes URIs of pods which must be notified on the post updates.
+    # Must always include local pod URI since we will want all the updates on the post if user migrates.
+    has_many :subscribed_pods_uris
+
+    # Only for private posts.
+    # Includes diaspora* IDs of people who must be notified on post updates.
+    has_many :subscribed_users_ids
+
+    # Normally accepts Post as an object.
+    def initialize(*)
+      super
+      self.except = [excluded_subscription_key]
+    end
+
+    private
+
+    def subscribed_pods_uris
+      object.subscribed_pods_uris.push(AppConfig.pod_uri.to_s)
+    end
+
+    def subscribed_users_ids
+      object.subscribers.map(&:diaspora_handle)
+    end
+
+    def excluded_subscription_key
+      entity.public ? :subscribed_users_ids : :subscribed_pods_uris
+    end
+  end
+end

app/serializers/export/own_relayables_serializer.rb

@@ -0,0 +1,13 @@
+module Export
+  # This is a serializer for the user's own relayables. We remove signature from the own relayables since it isn't
+  # useful and takes space.
+  class OwnRelayablesSerializer < FederationEntitySerializer
+    private
+
+    def modify_serializable_object(hash)
+      super.tap {|hash|
+        hash[:entity_data].delete(:author_signature)
+      }
+    end
+  end
+end

app/serializers/export/person_metadata_serializer.rb

@@ -0,0 +1,17 @@
+module Export
+  class PersonMetadataSerializer < ActiveModel::Serializer
+    attributes :guid,
+               :account_id,
+               :public_key
+
+    private
+
+    def account_id
+      object.diaspora_handle
+    end
+
+    def public_key
+      object.serialized_public_key
+    end
+  end
+end