Prepare model for optional Reading Group/Configuration visibility [no-ci]

Daniel · Diego Camarinha
1 parent 119b56ec
Showing 15 changed files with 140 additions and 25 deletions Show diff stats
app/models/kalibro_configuration.rb
app/models/kalibro_configuration_attributes.rb
app/models/kalibro_configuration_ownership.rb
app/models/reading_group.rb
app/models/reading_group_attributes.rb
app/models/reading_group_ownership.rb
app/models/user.rb
db/migrate/20140124124835_create_mezuro_configuration_ownerships.rb
db/migrate/20150511180712_rename_kalibro_configuration_ownerships_to_kalibro_confiugration_attributes.rb
db/migrate/20150511181035_rename_reading_group_ownerships_to_reading_group_attributes.rb
db/schema.rb
spec/factories/kalibro_configuration_attributes.rb
spec/factories/reading_group_attributes.rb
spec/models/kalibro_configuration_attributes_spec.rb
spec/models/reading_group_attributes_spec.rb
 class KalibroConfiguration < KalibroClient::Entities::Configurations::KalibroConfiguration
   include KalibroRecord
+
+  def self.public_or_owned_by_user(user=nil)
+    query = if user
+      KalibroConfigurationAttributes.where("user_id == ? OR public", user.id)
+    else
+      KalibroConfigurationAttributes.where(public: true)
+    end
+
+    query.map { |cfg_attr|
+      self.find(cfg_attr.kalibro_configuration_id)
+    }.compact
+  end
+
+  def self.public
+    self.public_or_owned_by_user(nil)
+  end
+
+  def attributes
+    KalibroConfigurationAttributes.find_by(kalibro_configuration_id: self.id)
+  end
 end
@@ -0,0 +1,13 @@
+class KalibroConfigurationAttributes < ActiveRecord::Base
+  belongs_to :user
+  validates :kalibro_configuration_id, presence: true
+
+  def kalibro_configuration
+    @kalibro_configuration ||= KalibroConfiguration.find(kalibro_configuration_id)
+  end
+
+  def kalibro_configuration=(cfg)
+    @kalibro_configuration = cfg
+    self.kalibro_configuration_id = cfg.id
+  end
+end
@@ -1,4 +0,0 @@
-class KalibroConfigurationOwnership < ActiveRecord::Base
-  belongs_to :user
-  validates :kalibro_configuration_id, presence: true
-end
 class ReadingGroup < KalibroClient::Entities::Configurations::ReadingGroup
   include KalibroRecord
+
+  def self.public_or_owned_by_user(user=nil)
+    query = if user
+      ReadingGroupAttributes.where("user_id == ? OR public", user.id)
+    else
+      ReadingGroupAttributes.where(public: true)
+    end
+
+    query.map { |cfg_attr|
+      self.find(cfg_attr.reading_group_id)
+    }.compact
+  end
+
+  def self.public
+    self.public_or_owned_by_user(nil)
+  end
+
+  def attributes
+    ReadingGroupAttributes.find_by(reading_group_id: self.id)
+  end
 end
@@ -0,0 +1,13 @@
+class ReadingGroupAttributes < ActiveRecord::Base
+  belongs_to :user
+  validates :reading_group_id, presence: true
+
+  def reading_group
+    @reading_group ||= ReadingGroup.find(reading_group_id)
+  end
+
+  def reading_group=(group)
+    @reading_group = group
+    self.reading_group_id = group.id
+  end
+end
@@ -1,4 +0,0 @@
-class ReadingGroupOwnership < ActiveRecord::Base
-  belongs_to :user
-  validates :reading_group_id, presence: true
-end
@@ -9,8 +9,8 @@ class User &lt; ActiveRecord::Base
   validates :email, uniqueness: true
   has_many :project_attributes, class_name: 'ProjectAttributes'
-  has_many :reading_group_ownerships
-  has_many :kalibro_configuration_ownerships
+  has_many :reading_group_attributess
+  has_many :kalibro_configuration_attributes
   # Alert: when adding new parameters to this model, they should also be added to registrations_controller
   def projects
-class CreateKalibroConfigurationOwnerships < ActiveRecord::Migration
+class CreateMezuroConfigurationOwnerships < ActiveRecord::Migration
   def change
-    create_table :kalibro_configuration_ownerships do |t|
+    create_table :mezuro_configuration_ownerships do |t|
       t.integer :user_id
-      t.integer :kalibro_configuration_id
+      t.integer :mezuro_configuration_id
       t.timestamps
     end
@@ -0,0 +1,6 @@
+class RenameKalibroConfigurationOwnershipsToKalibroConfiugrationAttributes < ActiveRecord::Migration
+  def change
+    rename_table :kalibro_configuration_ownerships, :kalibro_configuration_attributes
+    add_column :kalibro_configuration_attributes, :public, :boolean, default: false
+  end
+end
@@ -0,0 +1,6 @@
+class RenameReadingGroupOwnershipsToReadingGroupAttributes < ActiveRecord::Migration
+  def change
+    rename_table :reading_group_ownerships, :reading_group_attributes
+    add_column :reading_group_attributes, :public, :boolean, default: false
+  end
+end
@@ -11,13 +11,17 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20150225170704) do
+ActiveRecord::Schema.define(version: 20150511181035) do
-  create_table "kalibro_configuration_ownerships", force: :cascade do |t|
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "kalibro_configuration_attributes", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "kalibro_configuration_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "public",                   default: false
   end
   create_table "project_attributes", force: :cascade do |t|
@@ -29,30 +33,31 @@ ActiveRecord::Schema.define(version: 20150225170704) do
     t.datetime "updated_at",                 null: false
   end
-  create_table "reading_group_ownerships", force: :cascade do |t|
+  create_table "reading_group_attributes", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "reading_group_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "public",           default: false
   end
   create_table "users", force: :cascade do |t|
-    t.string   "name",                   limit: 255, default: "", null: false
-    t.string   "email",                  limit: 255, default: "", null: false
+    t.string   "name",                   default: "", null: false
+    t.string   "email",                  default: "", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "encrypted_password",     limit: 255, default: "", null: false
-    t.string   "reset_password_token",   limit: 255
+    t.string   "encrypted_password",     default: "", null: false
+    t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                      default: 0
+    t.integer  "sign_in_count",          default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip",     limit: 255
-    t.string   "last_sign_in_ip",        limit: 255
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
   end
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
 end
@@ -0,0 +1,13 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :kalibro_configuration_attributes, class: KalibroConfigurationAttributes do
+    association :user, strategy: :build
+    association :kalibro_configuration, :with_id, strategy: :build
+    self.public false
+
+    trait :public do
+      self.public true
+    end
+  end
+end
@@ -0,0 +1,13 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :reading_group_attributes, class: ReadingGroupAttributes do
+    association :user, strategy: :build
+    association :reading_group, :with_id, strategy: :build
+    self.public false
+
+    trait :public do
+      self.public true
+    end
+  end
+end
@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+describe KalibroConfigurationAttributes, :type => :model do
+  describe 'associations' do
+    it { is_expected.to belong_to(:user) }
+  end
+end
@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+describe ReadingGroupAttributes, :type => :model do
+  describe 'associations' do
+    it { is_expected.to belong_to(:user) }
+  end
+end
1	class KalibroConfiguration < KalibroClient::Entities::Configurations::KalibroConfiguration	1	class KalibroConfiguration < KalibroClient::Entities::Configurations::KalibroConfiguration
2	include KalibroRecord	2	include KalibroRecord
		3	+
		4	+ def self.public_or_owned_by_user(user=nil)
		5	+ query = if user
		6	+ KalibroConfigurationAttributes.where("user_id == ? OR public", user.id)
		7	+ else
		8	+ KalibroConfigurationAttributes.where(public: true)
		9	+ end
		10	+
		11	+ query.map { \|cfg_attr\|
		12	+ self.find(cfg_attr.kalibro_configuration_id)
		13	+ }.compact
		14	+ end
		15	+
		16	+ def self.public
		17	+ self.public_or_owned_by_user(nil)
		18	+ end
		19	+
		20	+ def attributes
		21	+ KalibroConfigurationAttributes.find_by(kalibro_configuration_id: self.id)
		22	+ end
3	end	23	end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class KalibroConfigurationAttributes < ActiveRecord::Base
	2	+ belongs_to :user
	3	+ validates :kalibro_configuration_id, presence: true
	4	+
	5	+ def kalibro_configuration
	6	+ @kalibro_configuration \|\|= KalibroConfiguration.find(kalibro_configuration_id)
	7	+ end
	8	+
	9	+ def kalibro_configuration=(cfg)
	10	+ @kalibro_configuration = cfg
	11	+ self.kalibro_configuration_id = cfg.id
	12	+ end
	13	+end
	@@ -1,4 +0,0 @@	@@ -1,4 +0,0 @@
1	-class KalibroConfigurationOwnership < ActiveRecord::Base
2	- belongs_to :user
3	- validates :kalibro_configuration_id, presence: true
4	-end
1	class ReadingGroup < KalibroClient::Entities::Configurations::ReadingGroup	1	class ReadingGroup < KalibroClient::Entities::Configurations::ReadingGroup
2	include KalibroRecord	2	include KalibroRecord
		3	+
		4	+ def self.public_or_owned_by_user(user=nil)
		5	+ query = if user
		6	+ ReadingGroupAttributes.where("user_id == ? OR public", user.id)
		7	+ else
		8	+ ReadingGroupAttributes.where(public: true)
		9	+ end
		10	+
		11	+ query.map { \|cfg_attr\|
		12	+ self.find(cfg_attr.reading_group_id)
		13	+ }.compact
		14	+ end
		15	+
		16	+ def self.public
		17	+ self.public_or_owned_by_user(nil)
		18	+ end
		19	+
		20	+ def attributes
		21	+ ReadingGroupAttributes.find_by(reading_group_id: self.id)
		22	+ end
3	end	23	end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class ReadingGroupAttributes < ActiveRecord::Base
	2	+ belongs_to :user
	3	+ validates :reading_group_id, presence: true
	4	+
	5	+ def reading_group
	6	+ @reading_group \|\|= ReadingGroup.find(reading_group_id)
	7	+ end
	8	+
	9	+ def reading_group=(group)
	10	+ @reading_group = group
	11	+ self.reading_group_id = group.id
	12	+ end
	13	+end
	@@ -1,4 +0,0 @@	@@ -1,4 +0,0 @@
1	-class ReadingGroupOwnership < ActiveRecord::Base
2	- belongs_to :user
3	- validates :reading_group_id, presence: true
4	-end
1	-class CreateKalibroConfigurationOwnerships < ActiveRecord::Migration	1	+class CreateMezuroConfigurationOwnerships < ActiveRecord::Migration
2	def change	2	def change
3	- create_table :kalibro_configuration_ownerships do \|t\|	3	+ create_table :mezuro_configuration_ownerships do \|t\|
4	t.integer :user_id	4	t.integer :user_id
5	- t.integer :kalibro_configuration_id	5	+ t.integer :mezuro_configuration_id
6		6
7	t.timestamps	7	t.timestamps
8	end	8	end
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+class RenameKalibroConfigurationOwnershipsToKalibroConfiugrationAttributes < ActiveRecord::Migration
	2	+ def change
	3	+ rename_table :kalibro_configuration_ownerships, :kalibro_configuration_attributes
	4	+ add_column :kalibro_configuration_attributes, :public, :boolean, default: false
	5	+ end
	6	+end
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+class RenameReadingGroupOwnershipsToReadingGroupAttributes < ActiveRecord::Migration
	2	+ def change
	3	+ rename_table :reading_group_ownerships, :reading_group_attributes
	4	+ add_column :reading_group_attributes, :public, :boolean, default: false
	5	+ end
	6	+end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+# Read about factories at https://github.com/thoughtbot/factory_girl
	2	+
	3	+FactoryGirl.define do
	4	+ factory :kalibro_configuration_attributes, class: KalibroConfigurationAttributes do
	5	+ association :user, strategy: :build
	6	+ association :kalibro_configuration, :with_id, strategy: :build
	7	+ self.public false
	8	+
	9	+ trait :public do
	10	+ self.public true
	11	+ end
	12	+ end
	13	+end