documentcloud · esthervillars · Feb 9, 2017 · Feb 15, 2017 · Feb 16, 2017 · Feb 16, 2017
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,6 @@ public/javascripts/vendor/*/
 .vagrant
 .tm_properties
 Vagrantfile
+*.sublime-*
+.byebug_history
+doc
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git@github.com:documentcloud/bull_proof_china_shop
-  revision: 64abcde27387c080fa58e79289f4a2632660f54d
+  revision: 648729a16dd568d286ae0343429632fe20f68537
   branch: master
   specs:
     bull_proof_china_shop (0.0.1)
@@ -433,4 +433,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.12.5
+   1.14.4
diff --git a/app/controllers/workspace_controller.rb b/app/controllers/workspace_controller.rb
@@ -14,7 +14,8 @@ class WorkspaceController < ApplicationController
   # searching, the home page otherwise.
   def index
     if logged_in? and current_account.real?
-      @projects = Project.load_for(current_account)
+      @projects = Project.load_for(current_account) # TODO: Filter out invitations
+      @project_invitations = [] # TODO: Fill this is in with invitations
       @current_organization = current_account.organization
       @organizations = Organization.all_slugs
       @has_documents = Document.owned_by(current_account).exists?

diff --git a/app/models/organization_project.rb b/app/models/organization_project.rb
@@ -0,0 +1,7 @@
+class OrganizationProject < ActiveRecord::Base
+
+  belongs_to :organization
+  belongs_to :project
+
+  validates :project_id, uniqueness: { scope: :organization_id }
+end
diff --git a/app/models/project_membership.rb b/app/models/project_membership.rb
@@ -2,6 +2,7 @@ class ProjectMembership < ActiveRecord::Base
 
   belongs_to :project
   belongs_to :document
+  # belongs_to :membership
 
   has_many :collaborations, :through => :project
 

diff --git a/app/serializers/collaboration_serializer.rb b/app/serializers/collaboration_serializer.rb
@@ -0,0 +1,45 @@
+class CollaborationSerializer < ActiveModel::Serializer
+
+  attributes :id,
+             :account_id,
+             :creator_id,
+             :membership_id,
+             :hidden,
+             :project_id,
+             :title,
+             :account_full_name,
+             :annotation_count,
+             :document_count,
+             :public_url,
+             :collaborators
+  # TODO use a project serializer and pass the project object
+  def project
+    Project.find(object.project_id)
+  end
+
+  def title
+    return '[Untitled Project]' if object.project.title.blank?
+    object.project.title
+  end
+
+  def account_full_name
+    object.project.account_full_name
+  end
+
+  def annotation_count
+    project.annotation_count(object.account)
+  end
+
+  def document_count
+    object.project.project_memberships.count
+  end
+
+  def public_url
+    object.project.public_url
+  end
+
+  def collaborators
+    object.project.other_collaborators(object.account)
+          .map { |c| c.canonical(include_organization: true) }
+  end
+end
diff --git a/app/views/common/_bootstrap.html.erb b/app/views/common/_bootstrap.html.erb
@@ -5,7 +5,7 @@
   Organizations.reset(<%=raw @organizations.to_json(:include_document_count=>true, :include_note_count=>true) %>);
   <% if @current_account && @current_account.memberships.any? %>
     <%= render :partial => 'accounts/current_account.js', :type => :js %>
-    // ProjectInvitations.reset(<%=raw @projects.to_json() %>);
+    ProjectInvitations.reset(<%=raw @project_invitations.to_json() %>);
     Projects.reset(<%=raw @projects.to_json({:account => @current_account, :include_collaborators => true}) %>);
     dc.searchPrefixes = <%=raw DC::ALL_SEARCHES.to_json %>;
   <% end %>

diff --git a/config/application.rb b/config/application.rb
@@ -23,7 +23,7 @@ class Application < Rails::Application
 
     # disable sprockets
     config.assets.enabled = false
-    
+
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de

diff --git a/db/migrate/20161019195011_add_attributes_to_account.rb b/db/migrate/20161019195011_add_attributes_to_account.rb
@@ -0,0 +1,9 @@
+class AddAttributesToAccount < ActiveRecord::Migration
+  def change
+    remove_column :accounts, :identities, :string
+
+    add_column :accounts, :provider, :string
+    add_column :accounts, :access_token, :string
+    add_column :accounts, :uid, :integer
+  end
+end
diff --git a/db/migrate/20161215174011_create_organization_projects.rb b/db/migrate/20161215174011_create_organization_projects.rb
@@ -0,0 +1,10 @@
+class CreateOrganizationProjects < ActiveRecord::Migration
+  def change
+    create_table :organization_projects do |t|
+      t.references :organization, index: true, foreign_key: true
+      t.references :project, index: true, foreign_key: true
+
+      t.timestamps # null: false
+    end
+  end
+end
diff --git a/db/migrate/20170124201757_add_membership_to_collaboration.rb b/db/migrate/20170124201757_add_membership_to_collaboration.rb
@@ -0,0 +1,6 @@
+class AddMembershipToCollaboration < ActiveRecord::Migration
+  def change
+    add_reference :collaborations, :membership, index: true
+    add_column :collaborations, :hidden, :boolean, default: false
+  end
+end