[ARVADOS] updated: f18348272f29cd7be2297a112c2b62aad8ca3389

[Git user]

Summary of changes:
 services/api/lib/create_permission_view.sql |  5 ++++-
 services/api/test/fixtures/collections.yml  | 11 +++++++++++
 services/api/test/fixtures/groups.yml       | 18 ++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

       via  f18348272f29cd7be2297a112c2b62aad8ca3389 (commit)
      from  01b6cbdfef9690a4b1aba815df63c3d7ee6b97ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f18348272f29cd7be2297a112c2b62aad8ca3389
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Aug 25 14:23:30 2017 -0400

    12032: Add test fixtures
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/lib/create_permission_view.sql b/services/api/lib/create_permission_view.sql
index e6195d7..639610a 100644
--- a/services/api/lib/create_permission_view.sql
+++ b/services/api/lib/create_permission_view.sql
@@ -37,7 +37,10 @@ perm_edges (tail_uuid, head_uuid, val, follow, trashed) AS (
               LEFT JOIN groups ON pv.val<3 AND groups.uuid = links.head_uuid
               WHERE links.link_class = 'permission'
        UNION ALL
-       SELECT owner_uuid, uuid, 3, true, CASE is_trashed WHEN true THEN 1 ELSE 0 END FROM groups
+       SELECT owner_uuid, uuid, 3, true, CASE
+              WHEN trash_at IS NOT NULL and trash_at < clock_timestamp() THEN 1
+              ELSE 0 END
+              FROM groups
        ),
 perm (val, follow, user_uuid, target_uuid, trashed, startnode) AS (
      SELECT 3::smallint             AS val,
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index 7777f74..8023503 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -703,6 +703,17 @@ same_name_as_trashed_coll_to_test_name_conflict_on_untrash:
   manifest_text: ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:file1 0:0:file2\n"
   name: same name for trashed and persisted collections
 
+collection_in_trashed_subproject:
+  uuid: zzzzz-4zz18-trashedproj2col
+  portable_data_hash: 80cf6dd2cf079dd13f272ec4245cb4a8+48
+  owner_uuid: zzzzz-j7d0g-trashedproject2
+  created_at: 2014-02-03T17:22:54Z
+  modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+  modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
+  modified_at: 2014-02-03T17:22:54Z
+  updated_at: 2014-02-03T17:22:54Z
+  manifest_text: ". d41d8cd98f00b204e9800998ecf8427e+0 0:0:file1 0:0:file2\n"
+  name: collection in trashed subproject
 
 # Test Helper trims the rest of the file
 
diff --git a/services/api/test/fixtures/groups.yml b/services/api/test/fixtures/groups.yml
index 90d087f..c9783d0 100644
--- a/services/api/test/fixtures/groups.yml
+++ b/services/api/test/fixtures/groups.yml
@@ -298,3 +298,21 @@ starred_and_shared_active_user_project:
   name: Starred and shared active user project
   description: Starred and shared active user project
   group_class: project
+
+trashed_project:
+  uuid: zzzzz-j7d0g-trashedproject1
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  name: trashed project
+  group_class: project
+  trash_at: 2001-01-01T00:00:00Z
+  delete_at: 2038-03-01T00:00:00Z
+  is_trashed: true
+
+trashed_subproject:
+  uuid: zzzzz-j7d0g-trashedproject2
+  owner_uuid:
+  name: trashed subproject
+  group_class: project
+  trash_at: 2001-01-01T00:00:00Z
+  delete_at: 2038-03-01T00:00:00Z
+  is_trashed: true

-----------------------------------------------------------------------


hooks/post-receive
--