X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/86c4b60b5f9e8ab1f20eeee1da0afce3db57ab3b..6431ee2e2cb4267de7b51cf4a52f23cb14cdc2a3:/services/api/app/models/group.rb diff --git a/services/api/app/models/group.rb b/services/api/app/models/group.rb index 0e857ad15c..3292642d48 100644 --- a/services/api/app/models/group.rb +++ b/services/api/app/models/group.rb @@ -1,10 +1,22 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + require 'can_be_an_owner' +require 'trashable' class Group < ArvadosModel include HasUuid include KindAndEtag include CommonApiTemplate include CanBeAnOwner + include Trashable + + # Posgresql JSONB columns should NOT be declared as serialized, Rails 5 + # already know how to properly treat them. + attribute :properties, :jsonbHash, default: {} + + validate :ensure_filesystem_compatible_name after_create :invalidate_permissions_cache after_update :maybe_invalidate_permissions_cache before_create :assign_name @@ -14,9 +26,50 @@ class Group < ArvadosModel t.add :group_class t.add :description t.add :writable_by + t.add :delete_at + t.add :trash_at + t.add :is_trashed + t.add :properties + end + + def ensure_filesystem_compatible_name + # project groups need filesystem-compatible names, but others + # don't. + super if group_class == 'project' end def maybe_invalidate_permissions_cache + if trash_at_changed? or owner_uuid_changed? + # The group was added or removed from the trash. + # + # Strategy: + # Determine the time this goes in the trash + # (or null, if it does not belong in the trash) + # Compute subtree to determine the time each subproject goes + # in the trash + # Remove groups that don't belong from trash + # Add/update groups that do belong in the trash + + temptable = "group_subtree_#{rand(2**64).to_s(10)}" + ActiveRecord::Base.connection.exec_query %{ +create temporary table #{temptable} on commit drop +as select * from project_subtree_with_trash_at($1, LEAST($2, $3)::timestamp) +}, + 'Group.get_subtree', + [[nil, self.uuid], + [nil, TrashedGroup.find_by_group_uuid(self.owner_uuid).andand.trash_at], + [nil, self.trash_at]] + + ActiveRecord::Base.connection.exec_query %{ +delete from trashed_groups where group_uuid in (select target_uuid from #{temptable} where trash_at is NULL); +} + + ActiveRecord::Base.connection.exec_query %{ +insert into trashed_groups (group_uuid, trash_at) + select target_uuid as group_uuid, trash_at from #{temptable} where trash_at is not NULL +on conflict (group_uuid) do update set trash_at=EXCLUDED.trash_at; +} + end if uuid_changed? or owner_uuid_changed? # This can change users' permissions on other groups as well as # this one. @@ -27,7 +80,7 @@ class Group < ArvadosModel def invalidate_permissions_cache # Ensure a new group can be accessed by the appropriate users # immediately after being created. - User.invalidate_permissions_cache + User.invalidate_permissions_cache self.async_permissions_update end def assign_name @@ -36,5 +89,4 @@ class Group < ArvadosModel end true end - end