CSPACE-2655: Added actionGroup to results returned in authorization/roles/*/permroles

diff --git a/services/account/pstore/src/main/resources/db/mysql/account.sql b/services/account/pstore/src/main/resources/db/mysql/account.sql
index c920678286db89998aca2bda5a2e5cb05c4d9f43..76a952b214200f4ea86d9dc6d3d04ff92f7ddbdf 100644 (file)
--- a/services/account/pstore/src/main/resources/db/mysql/account.sql
+++ b/services/account/pstore/src/main/resources/db/mysql/account.sql
@@ -6,3 +6,4 @@ create table accounts_common (csid varchar(128) not null, created_at datetime no
 create table accounts_tenants (HJID bigint not null auto_increment, tenant_id varchar(128) not null, TENANTS_ACCOUNTSCOMMON_CSID varchar(128), primary key (HJID));
 create table tenants (id varchar(128) not null, created_at datetime not null, name varchar(255) not null, updated_at datetime, primary key (id));
 alter table accounts_tenants add index FKFDA649B05A9CEEB5 (TENANTS_ACCOUNTSCOMMON_CSID), add constraint FKFDA649B05A9CEEB5 foreign key (TENANTS_ACCOUNTSCOMMON_CSID) references accounts_common (csid);
+

diff --git a/services/account/pstore/src/main/resources/db/mysql/account_index.sql b/services/account/pstore/src/main/resources/db/mysql/account_index.sql
index 7e248a065d6bd75957a22b66a7aacd6b93952906..0b9a66ec456a4406e3e2a340624492e20481e3bb 100644 (file)
--- a/services/account/pstore/src/main/resources/db/mysql/account_index.sql
+++ b/services/account/pstore/src/main/resources/db/mysql/account_index.sql
@@ -9,4 +9,4 @@ CREATE INDEX index_screen_name ON accounts_common (screen_name);
 CREATE INDEX index_email ON accounts_common (email);
 CREATE INDEX index_person_ref_name ON accounts_common (person_ref_name);
 CREATE INDEX index_update_at ON accounts_common (updated_at);
-CREATE INDEX index_status ON accounts_common (status);
\ No newline at end of file
+CREATE INDEX index_status ON accounts_common (status);

diff --git a/services/account/pstore/src/main/resources/db/mysql/test_account.sql b/services/account/pstore/src/main/resources/db/mysql/test_account.sql
index 8d85d4bc99c6f9dc6ac963a95a31cb73558bdcab..74d334fa00f032caf666b74cf19a57b255d51d98 100644 (file)
--- a/services/account/pstore/src/main/resources/db/mysql/test_account.sql
+++ b/services/account/pstore/src/main/resources/db/mysql/test_account.sql
@@ -22,4 +22,4 @@ INSERT INTO `cspace`.`accounts_common` (`csid`, `email`, `phone`, `mobile`, `use
 -- Association of accounts with tenants
 INSERT INTO `cspace`.`accounts_tenants` (`TENANTS_ACCOUNTSCOMMON_CSID`, `tenant_id`) VALUES ('eeca40d7-dc77-4cc5-b489-16a53c75525a', '1');
 INSERT INTO `cspace`.`accounts_tenants` (`TENANTS_ACCOUNTSCOMMON_CSID`, `tenant_id`) VALUES ('251f98f3-0292-4f3e-aa95-455314050e1b', '1');
-INSERT INTO `cspace`.`accounts_tenants` (`TENANTS_ACCOUNTSCOMMON_CSID`, `tenant_id`) VALUES ('ff2b4440-ed0d-4892-adb4-b6999eba3ae7', '2');
\ No newline at end of file
+INSERT INTO `cspace`.`accounts_tenants` (`TENANTS_ACCOUNTSCOMMON_CSID`, `tenant_id`) VALUES ('ff2b4440-ed0d-4892-adb4-b6999eba3ae7', '2');

diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java
index 103f7dd42210c53a961efe6aa33b3ff3c5078e5d..a2c216000aded6d28bcf470c60cff64df72a4412 100644 (file)
--- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java
+++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/importer/AuthorizationGen.java
@@ -327,6 +327,7 @@ public class AuthorizationGen {
         PermissionValue permValue = new PermissionValue();
         permValue.setPermissionId(perm.getCsid());
         permValue.setResourceName(perm.getResourceName().toLowerCase());
+        permValue.setActionGroup(perm.getActionGroup());
         permValues.add(permValue);
 
         List<RoleValue> roleValues = new ArrayList<RoleValue>();

diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java
index 124d3c19a4aa51be3605ca9fece071a3864c82cf..f8cbda541fcf31f3986c8a41bc90d88c3c3f013f 100644 (file)
--- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java
+++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java
@@ -196,6 +196,7 @@ public class PermissionRoleDocumentHandler
         PermissionValue pv = new PermissionValue();
         pv.setPermissionId(prr.getPermissionId());
         pv.setResourceName(prr.getPermissionResource());
+        pv.setActionGroup(prr.getActionGroup());
         return pv;
     }
 

diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleUtil.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleUtil.java
index 4a3da1578bf726552bc0545db48a333f37052b68..365716a1121eaaea8cfae3ed423efc0d0240e8ff 100644 (file)
--- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleUtil.java
+++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleUtil.java
@@ -89,6 +89,7 @@ public class PermissionRoleUtil {
         PermissionRoleRel prr = new PermissionRoleRel();
         prr.setPermissionId(pv.getPermissionId());
         prr.setPermissionResource(pv.getResourceName());
+        prr.setActionGroup(pv.getActionGroup());
         prr.setRoleId(rv.getRoleId());
         prr.setRoleName(rv.getRoleName());
         return prr;

diff --git a/services/authorization/jaxb/src/main/resources/authorization_common.xsd b/services/authorization/jaxb/src/main/resources/authorization_common.xsd
index e53e8b8f4138dbb447500e098a5038f812bf0423..583613b4f27ba847850ee1656c8c6ad5ab0426f9 100644 (file)
--- a/services/authorization/jaxb/src/main/resources/authorization_common.xsd
+++ b/services/authorization/jaxb/src/main/resources/authorization_common.xsd
@@ -83,6 +83,7 @@
         <xs:sequence>
             <xs:element name="permissionId" type="xs:string" minOccurs="1" maxOccurs="1"/>
             <xs:element name="resourceName" type="xs:string" minOccurs="1" maxOccurs="1"/>
+            <xs:element name="actionGroup" type="xs:string" minOccurs="1" maxOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
 

diff --git a/services/authorization/jaxb/src/main/resources/permissions_roles.xsd b/services/authorization/jaxb/src/main/resources/permissions_roles.xsd
index 0918afab0cfd2bf4b3922c1e8372b4dfe931e0ee..e31f41e5590c2cffdaab63c1a3f7290678535fc6 100644 (file)
--- a/services/authorization/jaxb/src/main/resources/permissions_roles.xsd
+++ b/services/authorization/jaxb/src/main/resources/permissions_roles.xsd
@@ -107,6 +107,15 @@
                     </xs:appinfo>
                 </xs:annotation>
             </xs:element>
+            <xs:element name="actionGroup" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                    <xs:appinfo>
+                        <hj:basic>
+                            <orm:column name="actionGroup" nullable="true"/>
+                        </hj:basic>
+                    </xs:appinfo>
+                </xs:annotation>
+            </xs:element>
             <xs:element name="roleId" type="xs:string" minOccurs="1" maxOccurs="1">
                 <xs:annotation>
                     <xs:appinfo>

diff --git a/services/authorization/pstore/src/main/resources/db/mysql/authorization.sql b/services/authorization/pstore/src/main/resources/db/mysql/authorization.sql
index 78d80a785e9d594d5bd0a38450f0c61120f03ca8..e4a16097089383a93af1b3796e66919c4dd2e035 100644 (file)
--- a/services/authorization/pstore/src/main/resources/db/mysql/authorization.sql
+++ b/services/authorization/pstore/src/main/resources/db/mysql/authorization.sql
@@ -7,6 +7,7 @@ drop table if exists roles;
 create table accounts_roles (HJID bigint not null auto_increment, account_id varchar(128) not null, created_at datetime not null, role_id varchar(128) not null, role_name varchar(255), screen_name varchar(255), user_id varchar(128) not null, primary key (HJID), unique (account_id, role_id));
 create table permissions (csid varchar(128) not null, action_group varchar(128), attribute_name varchar(128), created_at datetime not null, description varchar(255), effect varchar(32) not null, resource_name varchar(128) not null, tenant_id varchar(128) not null, updated_at datetime, primary key (csid));
 create table permissions_actions (HJID bigint not null auto_increment, name varchar(128) not null, ACTIONS_PERMISSION_CSID varchar(128), primary key (HJID));
-create table permissions_roles (HJID bigint not null auto_increment, created_at datetime not null, permission_id varchar(128) not null, permission_resource varchar(255), role_id varchar(128) not null, role_name varchar(255), primary key (HJID), unique (permission_id, role_id));
+create table permissions_roles (HJID bigint not null auto_increment, actionGroup varchar(255), created_at datetime not null, permission_id varchar(128) not null, permission_resource varchar(255), role_id varchar(128) not null, role_name varchar(255), primary key (HJID), unique (permission_id, role_id));
 create table roles (csid varchar(128) not null, created_at datetime not null, description varchar(255), rolegroup varchar(255), rolename varchar(200) not null, tenant_id varchar(128) not null, updated_at datetime, primary key (csid), unique (rolename, tenant_id));
 alter table permissions_actions add index FK85F82042E2DC84FD (ACTIONS_PERMISSION_CSID), add constraint FK85F82042E2DC84FD foreign key (ACTIONS_PERMISSION_CSID) references permissions (csid);
+

diff --git a/services/authorization/pstore/src/main/resources/db/mysql/authorization_index.sql b/services/authorization/pstore/src/main/resources/db/mysql/authorization_index.sql
index 012e86abd489d9a2756c87a91f248ad66633d1a1..7f5fdd70e3c6273a20aa5d8cd9ba985246aa582c 100644 (file)
--- a/services/authorization/pstore/src/main/resources/db/mysql/authorization_index.sql
+++ b/services/authorization/pstore/src/main/resources/db/mysql/authorization_index.sql
@@ -14,3 +14,4 @@ CREATE INDEX index_role_id ON accounts_roles (role_id);
 
 CREATE INDEX index_permission_id ON permissions_roles (permission_id);
 CREATE INDEX index_role_id ON permissions_roles (role_id);
+

diff --git a/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql b/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql
index 226cf5f27d28018c7f908b8ef83cd913b010df8d..7bd6755c587cb173cda5b714ff028aec727763da 100644 (file)
--- a/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql
+++ b/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql
@@ -19,3 +19,4 @@ insert into `accounts_roles`(`account_id`, `user_id`, `role_id`, `role_name`, `c
 -- todo: barney is created in security test but accountrole is not yet created there, so add fake account id\r
 insert into `accounts_roles`(`account_id`, `user_id`, `role_id`, `role_name`, `created_at`) values ('1', 'barney', '2', 'ROLE_USERS', now());\r
 \r
+\r