Added UserTeam core models (team and m-t-m relationships) and updated other models

Andrey Kumanyaev · Dmitriy Zaporozhets
1 parent f6c482c0
Showing 14 changed files with 249 additions and 29 deletions Show diff stats
app/models/concerns/issuable.rb
app/models/project.rb
app/models/user.rb
app/models/user_team.rb
app/models/user_team_project_relationship.rb
app/models/user_team_user_relationship.rb
app/models/users_project.rb
db/migrate/20121219183753_create_user_teams.rb
db/migrate/20121220064104_create_user_team_project_relationships.rb
db/migrate/20121220064453_create_user_team_user_relationships.rb
db/schema.rb
spec/models/user_team_project_relationship_spec.rb
spec/models/user_team_spec.rb
spec/models/user_team_user_relationship_spec.rb
@@ -22,6 +22,7 @@ module Issuable
     scope :opened, where(closed: false)
     scope :closed, where(closed: true)
     scope :of_group, ->(group) { where(project_id: group.project_ids) }
+    scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) }
     scope :assigned, ->(u) { where(assignee_id: u.id)}
     scope :recent, order("created_at DESC")
@@ -33,28 +33,31 @@ class Project &lt; ActiveRecord::Base
   attr_accessor :error_code
   # Relations
-  belongs_to :group, foreign_key: "namespace_id", conditions: "type = 'Group'"
+  belongs_to :creator,      foreign_key: "creator_id", class_name: "User"
+  belongs_to :group,        foreign_key: "namespace_id", conditions: "type = 'Group'"
   belongs_to :namespace
-  belongs_to :creator,
-    class_name: "User",
-    foreign_key: "creator_id"
-
-  has_many :users,          through: :users_projects
-  has_many :events,         dependent: :destroy
-  has_many :merge_requests, dependent: :destroy
-  has_many :issues,         dependent: :destroy, order: "closed, created_at DESC"
-  has_many :milestones,     dependent: :destroy
-  has_many :users_projects, dependent: :destroy
-  has_many :notes,          dependent: :destroy
-  has_many :snippets,       dependent: :destroy
-  has_many :deploy_keys,    dependent: :destroy, foreign_key: "project_id", class_name: "Key"
-  has_many :hooks,          dependent: :destroy, class_name: "ProjectHook"
-  has_many :wikis,          dependent: :destroy
-  has_many :protected_branches, dependent: :destroy
   has_one :last_event, class_name: 'Event', order: 'events.created_at DESC', foreign_key: 'project_id'
   has_one :gitlab_ci_service, dependent: :destroy
+  has_many :events,             dependent: :destroy
+  has_many :merge_requests,     dependent: :destroy
+  has_many :issues,             dependent: :destroy, order: "closed, created_at DESC"
+  has_many :milestones,         dependent: :destroy
+  has_many :users_projects,     dependent: :destroy
+  has_many :notes,              dependent: :destroy
+  has_many :snippets,           dependent: :destroy
+  has_many :deploy_keys,        dependent: :destroy, class_name: "Key", foreign_key: "project_id"
+  has_many :hooks,              dependent: :destroy, class_name: "ProjectHook"
+  has_many :wikis,              dependent: :destroy
+  has_many :protected_branches, dependent: :destroy
+  has_many :user_team_project_relationships, dependent: :destroy
+
+  has_many :users,          through: :users_projects
+  has_many :user_teams,     through: :user_team_project_relationships
+  has_many :user_team_user_relationships, through: :user_teams
+  has_many :user_teams_members, through: :user_team_user_relationships
+
   delegate :name, to: :owner, allow_nil: true, prefix: true
   # Validations
@@ -77,6 +80,8 @@ class Project &lt; ActiveRecord::Base
   # Scopes
   scope :without_user, ->(user)  { where("id NOT IN (:ids)", ids: user.authorized_projects.map(&:id) ) }
   scope :not_in_group, ->(group) { where("id NOT IN (:ids)", ids: group.project_ids ) }
+  scope :without_team, ->(team) { where("id NOT IN (:ids)", ids: team.projects.map(&:id)) }
+  scope :in_team, ->(team) { where("id IN (:ids)", ids: team.projects.map(&:id)) }
   scope :in_namespace, ->(namespace) { where(namespace_id: namespace.id) }
   scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") }
   scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
@@ -45,18 +45,27 @@ class User &lt; ActiveRecord::Base
   attr_accessor :force_random_password
   # Namespace for personal projects
-  has_one :namespace, class_name: "Namespace", foreign_key: :owner_id, conditions: 'type IS NULL', dependent: :destroy
-  has_many :groups, class_name: "Group", foreign_key: :owner_id
-
-  has_many :keys, dependent: :destroy
-  has_many :users_projects, dependent: :destroy
-  has_many :issues, foreign_key: :author_id, dependent: :destroy
-  has_many :notes, foreign_key: :author_id, dependent: :destroy
-  has_many :merge_requests, foreign_key: :author_id, dependent: :destroy
-  has_many :events, class_name: "Event", foreign_key: :author_id, dependent: :destroy
-  has_many :recent_events, class_name: "Event", foreign_key: :author_id, order: "id DESC"
-  has_many :assigned_issues, class_name: "Issue", foreign_key: :assignee_id, dependent: :destroy
-  has_many :assigned_merge_requests, class_name: "MergeRequest", foreign_key: :assignee_id, dependent: :destroy
+  has_one :namespace,                 dependent: :destroy, foreign_key: :owner_id,    class_name: "Namespace", conditions: 'type IS NULL'
+
+  has_many :keys,                     dependent: :destroy
+  has_many :users_projects,           dependent: :destroy
+  has_many :issues,                   dependent: :destroy, foreign_key: :author_id
+  has_many :notes,                    dependent: :destroy, foreign_key: :author_id
+  has_many :merge_requests,           dependent: :destroy, foreign_key: :author_id
+  has_many :events,                   dependent: :destroy, foreign_key: :author_id,   class_name: "Event"
+  has_many :assigned_issues,          dependent: :destroy, foreign_key: :assignee_id, class_name: "Issue"
+  has_many :assigned_merge_requests,  dependent: :destroy, foreign_key: :assignee_id, class_name: "MergeRequest"
+
+  has_many :groups,         class_name: "Group", foreign_key: :owner_id
+  has_many :recent_events,  class_name: "Event", foreign_key: :author_id, order: "id DESC"
+
+  has_many :projects,       through: :users_projects
+
+  has_many :user_team_user_relationships, dependent: :destroy
+
+  has_many :user_teams,                      through: :user_team_user_relationships
+  has_many :user_team_project_relationships, through: :user_teams
+  has_many :team_projects,                   through: :user_team_project_relationships
   validates :name, presence: true
   validates :bio, length: { within: 0..255 }
@@ -80,6 +89,8 @@ class User &lt; ActiveRecord::Base
   scope :blocked, where(blocked:  true)
   scope :active, where(blocked:  false)
   scope :alphabetically, order('name ASC')
+  scope :in_team, ->(team){ where(id: team.member_ids) }
+  scope :not_in_team, ->(team){ where('users.id NOT IN (:ids)', ids: team.member_ids) }
   #
   # Class methods
@@ -0,0 +1,87 @@
+class UserTeam < ActiveRecord::Base
+  attr_accessible :name, :owner_id, :path
+
+  belongs_to :owner, class_name: User
+
+  has_many :user_team_project_relationships, dependent: :destroy
+  has_many :user_team_user_relationships, dependent: :destroy
+
+  has_many :projects, through: :user_team_project_relationships
+  has_many :members,  through: :user_team_user_relationships, source: :user
+
+  validates :name, presence: true, uniqueness: true
+  validates :owner, presence: true
+  validates :path, uniqueness: true, presence: true, length: { within: 1..255 },
+            format: { with: Gitlab::Regex.path_regex,
+                      message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
+
+  scope :with_member, ->(user){ joins(:user_team_user_relationships).where(user_team_user_relationships: {user_id: user.id}) }
+  scope :created_by, ->(user){ where(owner_id: user) }
+
+  class << self
+    def search query
+      where("name LIKE :query OR path LIKE :query", query: "%#{query}%")
+    end
+
+    def global_id
+      'GLN'
+    end
+
+    def access_roles
+      UsersProject.access_roles
+    end
+  end
+
+  def to_param
+    path
+  end
+
+  def assign_to_projects(projects, access)
+    projects.each do |project|
+      assign_to_project(project, access)
+    end
+  end
+
+  def assign_to_project(project, access)
+    Gitlab::UserTeamManager.assign(self, project, access)
+  end
+
+  def resign_from_project(project)
+    Gitlab::UserTeamManager.resign(self, project)
+  end
+
+  def add_members(users, access, group_admin)
+    users.each do |user|
+      add_member(user, access, group_admin)
+    end
+  end
+
+  def add_member(user, access, group_admin)
+    Gitlab::UserTeamManager.add_member_into_team(self, user, access, group_admin)
+  end
+
+  def remove_member(user)
+    Gitlab::UserTeamManager.remove_member_from_team(self, user)
+  end
+
+  def max_project_access(project)
+    user_team_project_relationships.find_by_project_id(project).greatest_access
+  end
+
+  def human_max_project_access(project)
+    self.class.access_roles.invert[max_project_access(project)]
+  end
+
+  def default_projects_access(member)
+    user_team_user_relationships.find_by_user_id(member).permission
+  end
+
+  def human_default_projects_access(member)
+    self.class.access_roles.invert[default_projects_access(member)]
+  end
+
+  def admin?(member)
+    user_team_user_relationships.with_user(member).first.group_admin?
+  end
+
+end
@@ -0,0 +1,24 @@
+class UserTeamProjectRelationship < ActiveRecord::Base
+  attr_accessible :greatest_access, :project_id, :user_team_id
+
+  belongs_to :user_team
+  belongs_to :project
+
+  validates :project,   presence: true
+  validates :user_team, presence: true
+  validate :check_greatest_access
+
+  scope :with_project, ->(project){ where(project_id: project.id) }
+
+  private
+
+  def check_greatest_access
+    errors.add(:base, :incorrect_access_code) unless correct_access?
+  end
+
+  def correct_access?
+    return false if greatest_access.blank?
+    return true if UsersProject.access_roles.has_value?(greatest_access)
+    false
+  end
+end
@@ -0,0 +1,15 @@
+class UserTeamUserRelationship < ActiveRecord::Base
+  attr_accessible :group_admin, :permission, :user_id, :user_team_id
+
+  belongs_to :user_team
+  belongs_to :user
+
+  validates :user_team, presence: true
+  validates :user,      presence: true
+
+  scope :with_user, ->(user) { where(user_id: user.id) }
+
+  def user_name
+    user.name
+  end
+end
@@ -39,7 +39,10 @@ class UsersProject &lt; ActiveRecord::Base
   scope :reporters, where(project_access: REPORTER)
   scope :developers, where(project_access: DEVELOPER)
   scope :masters, where(project_access: MASTER)
+
   scope :in_project, ->(project) { where(project_id: project.id) }
+  scope :in_projects, ->(projects) { where(project_id: projects.map(&:id)) }
+  scope :with_user, ->(user) { where(user_id: user.id) }
   class << self
@@ -0,0 +1,11 @@
+class CreateUserTeams < ActiveRecord::Migration
+  def change
+    create_table :user_teams do |t|
+      t.string :name
+      t.string :path
+      t.integer :owner_id
+
+      t.timestamps
+    end
+  end
+end
@@ -0,0 +1,11 @@
+class CreateUserTeamProjectRelationships < ActiveRecord::Migration
+  def change
+    create_table :user_team_project_relationships do |t|
+      t.integer :project_id
+      t.integer :user_team_id
+      t.integer :greatest_access
+
+      t.timestamps
+    end
+  end
+end
@@ -0,0 +1,12 @@
+class CreateUserTeamUserRelationships < ActiveRecord::Migration
+  def change
+    create_table :user_team_user_relationships do |t|
+      t.integer :user_id
+      t.integer :user_team_id
+      t.boolean :group_admin
+      t.integer :permission
+
+      t.timestamps
+    end
+  end
+end
@@ -213,6 +213,31 @@ ActiveRecord::Schema.define(:version =&gt; 20130110172407) do
     t.string "name"
   end
+  create_table "user_team_project_relationships", :force => true do |t|
+    t.integer  "project_id"
+    t.integer  "user_team_id"
+    t.integer  "greatest_access"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+  end
+
+  create_table "user_team_user_relationships", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "user_team_id"
+    t.boolean  "group_admin"
+    t.integer  "permission"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "user_teams", :force => true do |t|
+    t.string   "name"
+    t.string   "path"
+    t.integer  "owner_id"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "users", :force => true do |t|
     t.string   "email",                  :default => "",    :null => false
     t.string   "encrypted_password",     :default => "",    :null => false
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe UserTeamProjectRelationship do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe UserTeam do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe UserTeamUserRelationship do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
	@@ -22,6 +22,7 @@ module Issuable		@@ -22,6 +22,7 @@ module Issuable
22	scope :opened, where(closed: false)	22	scope :opened, where(closed: false)
23	scope :closed, where(closed: true)	23	scope :closed, where(closed: true)
24	scope :of_group, ->(group) { where(project_id: group.project_ids) }	24	scope :of_group, ->(group) { where(project_id: group.project_ids) }
		25	+ scope :of_user_team, ->(team) { where(project_id: team.project_ids, assignee_id: team.member_ids) }
25	scope :assigned, ->(u) { where(assignee_id: u.id)}	26	scope :assigned, ->(u) { where(assignee_id: u.id)}
26	scope :recent, order("created_at DESC")	27	scope :recent, order("created_at DESC")
27		28
@@ -0,0 +1,87 @@		@@ -0,0 +1,87 @@
	1	+class UserTeam < ActiveRecord::Base
	2	+ attr_accessible :name, :owner_id, :path
	3	+
	4	+ belongs_to :owner, class_name: User
	5	+
	6	+ has_many :user_team_project_relationships, dependent: :destroy
	7	+ has_many :user_team_user_relationships, dependent: :destroy
	8	+
	9	+ has_many :projects, through: :user_team_project_relationships
	10	+ has_many :members, through: :user_team_user_relationships, source: :user
	11	+
	12	+ validates :name, presence: true, uniqueness: true
	13	+ validates :owner, presence: true
	14	+ validates :path, uniqueness: true, presence: true, length: { within: 1..255 },
	15	+ format: { with: Gitlab::Regex.path_regex,
	16	+ message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
	17	+
	18	+ scope :with_member, ->(user){ joins(:user_team_user_relationships).where(user_team_user_relationships: {user_id: user.id}) }
	19	+ scope :created_by, ->(user){ where(owner_id: user) }
	20	+
	21	+ class << self
	22	+ def search query
	23	+ where("name LIKE :query OR path LIKE :query", query: "%#{query}%")
	24	+ end
	25	+
	26	+ def global_id
	27	+ 'GLN'
	28	+ end
	29	+
	30	+ def access_roles
	31	+ UsersProject.access_roles
	32	+ end
	33	+ end
	34	+
	35	+ def to_param
	36	+ path
	37	+ end
	38	+
	39	+ def assign_to_projects(projects, access)
	40	+ projects.each do \|project\|
	41	+ assign_to_project(project, access)
	42	+ end
	43	+ end
	44	+
	45	+ def assign_to_project(project, access)
	46	+ Gitlab::UserTeamManager.assign(self, project, access)
	47	+ end
	48	+
	49	+ def resign_from_project(project)
	50	+ Gitlab::UserTeamManager.resign(self, project)
	51	+ end
	52	+
	53	+ def add_members(users, access, group_admin)
	54	+ users.each do \|user\|
	55	+ add_member(user, access, group_admin)
	56	+ end
	57	+ end
	58	+
	59	+ def add_member(user, access, group_admin)
	60	+ Gitlab::UserTeamManager.add_member_into_team(self, user, access, group_admin)
	61	+ end
	62	+
	63	+ def remove_member(user)
	64	+ Gitlab::UserTeamManager.remove_member_from_team(self, user)
	65	+ end
	66	+
	67	+ def max_project_access(project)
	68	+ user_team_project_relationships.find_by_project_id(project).greatest_access
	69	+ end
	70	+
	71	+ def human_max_project_access(project)
	72	+ self.class.access_roles.invert[max_project_access(project)]
	73	+ end
	74	+
	75	+ def default_projects_access(member)
	76	+ user_team_user_relationships.find_by_user_id(member).permission
	77	+ end
	78	+
	79	+ def human_default_projects_access(member)
	80	+ self.class.access_roles.invert[default_projects_access(member)]
	81	+ end
	82	+
	83	+ def admin?(member)
	84	+ user_team_user_relationships.with_user(member).first.group_admin?
	85	+ end
	86	+
	87	+end
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+class UserTeamProjectRelationship < ActiveRecord::Base
	2	+ attr_accessible :greatest_access, :project_id, :user_team_id
	3	+
	4	+ belongs_to :user_team
	5	+ belongs_to :project
	6	+
	7	+ validates :project, presence: true
	8	+ validates :user_team, presence: true
	9	+ validate :check_greatest_access
	10	+
	11	+ scope :with_project, ->(project){ where(project_id: project.id) }
	12	+
	13	+ private
	14	+
	15	+ def check_greatest_access
	16	+ errors.add(:base, :incorrect_access_code) unless correct_access?
	17	+ end
	18	+
	19	+ def correct_access?
	20	+ return false if greatest_access.blank?
	21	+ return true if UsersProject.access_roles.has_value?(greatest_access)
	22	+ false
	23	+ end
	24	+end
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+class UserTeamUserRelationship < ActiveRecord::Base
	2	+ attr_accessible :group_admin, :permission, :user_id, :user_team_id
	3	+
	4	+ belongs_to :user_team
	5	+ belongs_to :user
	6	+
	7	+ validates :user_team, presence: true
	8	+ validates :user, presence: true
	9	+
	10	+ scope :with_user, ->(user) { where(user_id: user.id) }
	11	+
	12	+ def user_name
	13	+ user.name
	14	+ end
	15	+end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class CreateUserTeams < ActiveRecord::Migration
	2	+ def change
	3	+ create_table :user_teams do \|t\|
	4	+ t.string :name
	5	+ t.string :path
	6	+ t.integer :owner_id
	7	+
	8	+ t.timestamps
	9	+ end
	10	+ end
	11	+end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class CreateUserTeamProjectRelationships < ActiveRecord::Migration
	2	+ def change
	3	+ create_table :user_team_project_relationships do \|t\|
	4	+ t.integer :project_id
	5	+ t.integer :user_team_id
	6	+ t.integer :greatest_access
	7	+
	8	+ t.timestamps
	9	+ end
	10	+ end
	11	+end
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class CreateUserTeamUserRelationships < ActiveRecord::Migration
	2	+ def change
	3	+ create_table :user_team_user_relationships do \|t\|
	4	+ t.integer :user_id
	5	+ t.integer :user_team_id
	6	+ t.boolean :group_admin
	7	+ t.integer :permission
	8	+
	9	+ t.timestamps
	10	+ end
	11	+ end
	12	+end
	@@ -213,6 +213,31 @@ ActiveRecord::Schema.define(:version => 20130110172407) do		@@ -213,6 +213,31 @@ ActiveRecord::Schema.define(:version => 20130110172407) do
213	t.string "name"	213	t.string "name"
214	end	214	end
215		215
		216	+ create_table "user_team_project_relationships", :force => true do \|t\|
		217	+ t.integer "project_id"
		218	+ t.integer "user_team_id"
		219	+ t.integer "greatest_access"
		220	+ t.datetime "created_at", :null => false
		221	+ t.datetime "updated_at", :null => false
		222	+ end
		223	+
		224	+ create_table "user_team_user_relationships", :force => true do \|t\|
		225	+ t.integer "user_id"
		226	+ t.integer "user_team_id"
		227	+ t.boolean "group_admin"
		228	+ t.integer "permission"
		229	+ t.datetime "created_at", :null => false
		230	+ t.datetime "updated_at", :null => false
		231	+ end
		232	+
		233	+ create_table "user_teams", :force => true do \|t\|
		234	+ t.string "name"
		235	+ t.string "path"
		236	+ t.integer "owner_id"
		237	+ t.datetime "created_at", :null => false
		238	+ t.datetime "updated_at", :null => false
		239	+ end
		240	+
216	create_table "users", :force => true do \|t\|	241	create_table "users", :force => true do \|t\|
217	t.string "email", :default => "", :null => false	242	t.string "email", :default => "", :null => false
218	t.string "encrypted_password", :default => "", :null => false	243	t.string "encrypted_password", :default => "", :null => false
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+require 'spec_helper'
	2	+
	3	+describe UserTeamProjectRelationship do
	4	+ pending "add some examples to (or delete) #{__FILE__}"
	5	+end