Merge b728145 into b1b2aa1

src/main/resources/org/broadinstitute/dsde/sam/liquibase/changelog.xml

@@ -11,4 +11,5 @@
     <include file="changesets/20200901_descendant_permissions.xml" relativeToChangelogFile="true"/>
     <include file="changesets/20201028_nested_roles.xml" relativeToChangelogFile="true"/>
     <include file="changesets/20201029_resource_type_fields.xml" relativeToChangelogFile="true"/>
+    <include file="changesets/20201102_flattened_role_materialized_view.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

src/main/resources/org/broadinstitute/dsde/sam/liquibase/changesets/20201102_flattened_role_materialized_view.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog logicalFilePath="dummy"
+                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
+
+    <changeSet logicalFilePath="dummy" author="mtalbott" id="flattened_role_materialized_view">
+        <sql stripComments="true">
+            create materialized view sam_flattened_role as (
+            with recursive flattened_role(base_role_id, nested_role_id, descendants_only) as (
+            select resourceRole.id, resourceRole.id, false from sam_resource_role resourceRole
+            union
+            select flattened_role.base_role_id, nestedRole.nested_role_id, nestedRole.descendants_only from sam_nested_role nestedRole
+            join flattened_role on flattened_role.nested_role_id = nestedRole.base_role_id
+            ) select * from flattened_role);
+        </sql>
+    </changeSet>
+</databaseChangeLog>

src/main/scala/org/broadinstitute/dsde/workbench/sam/openam/PostgresAccessPolicyDAO.scala

@@ -221,7 +221,9 @@ class PostgresAccessPolicyDAO(protected val dbRef: DbReference,
                 (values ${nestedRoles}) as insertValues (base_resource_type_id, base_role_name, nested_resource_type_id, nested_role_name, descendants_only)
                 join ${ResourceRoleTable as resourceRole} on insertValues.base_role_name = ${resourceRole.role} and insertValues.base_resource_type_id = ${resourceRole.resourceTypeId}
                 join ${ResourceRoleTable as nestedResourceRole} on insertValues.nested_role_name = ${nestedResourceRole.role} and insertValues.nested_resource_type_id = ${nestedResourceRole.resourceTypeId}"""
-      insertQuery.update().apply()
+      val result = insertQuery.update().apply()
+      samsql"""refresh materialized view sam_flattened_role""".update.apply()
+      result
     } else {
       0
     }