From 470f511b3048b8bedebc18085afd148f73038668 Mon Sep 17 00:00:00 2001 From: pablone Date: Thu, 24 Aug 2023 08:05:27 +0200 Subject: [PATCH 1/3] refs #5881 createRolAndGrantAcl --- db/changes/233601/00-createClaimReader.sql | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 db/changes/233601/00-createClaimReader.sql diff --git a/db/changes/233601/00-createClaimReader.sql b/db/changes/233601/00-createClaimReader.sql new file mode 100644 index 000000000..10ab03d29 --- /dev/null +++ b/db/changes/233601/00-createClaimReader.sql @@ -0,0 +1,33 @@ +INSERT INTO `account`.`role` (`id`, `name`, `description`, `hasLogin`) + VALUES (122, 'claimViewer','Trabajadores que consulta las reclamaciones ',1); + +INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`) + VALUES (35, 122); +INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`) + VALUES (18, 122); +INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`) + VALUES (41, 122); +INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`) + VALUES (57, 122); + +DELETE FROM `salix`.`ACL` + WHERE `model`= 'claim' + AND `property` = 'filter'; +DELETE FROM `salix`.`ACL` + WHERE `model`= 'claim' + AND `property` = 'find'; +DELETE FROM `salix`.`ACL` + WHERE `model`= 'claim' + AND `property` = 'findById'; +DELETE FROM `salix`.`ACL` + WHERE `model`= 'claim' + AND `property` = 'getSummary'; + +INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) + VALUES ('Claim','filter','READ','ALLOW','ROLE','claimViewer'); +INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) + VALUES ('Claim','find','READ','ALLOW','ROLE','claimViewer'); +INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) + VALUES ('Claim','findById','READ','ALLOW','ROLE','claimViewer'); +INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) + VALUES ('Claim','getSummary','READ','ALLOW','ROLE','claimViewer'); -- 2.40.1 From 3694fcbbfb6c24d17538b0323efa764764e35c77 Mon Sep 17 00:00:00 2001 From: pablone Date: Thu, 24 Aug 2023 10:04:32 +0200 Subject: [PATCH 2/3] refs #5881 fixCreateRol --- db/changes/233601/00-createClaimReader.sql | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/db/changes/233601/00-createClaimReader.sql b/db/changes/233601/00-createClaimReader.sql index 10ab03d29..b1accf329 100644 --- a/db/changes/233601/00-createClaimReader.sql +++ b/db/changes/233601/00-createClaimReader.sql @@ -1,33 +1,33 @@ INSERT INTO `account`.`role` (`id`, `name`, `description`, `hasLogin`) - VALUES (122, 'claimViewer','Trabajadores que consulta las reclamaciones ',1); + VALUES ('claimViewer','Trabajadores que consulta las reclamaciones ',1); INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`) - VALUES (35, 122); -INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`) - VALUES (18, 122); -INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`) - VALUES (41, 122); -INSERT INTO `account`.`roleInherit` (`role`,`inheritsFrom`) - VALUES (57, 122); + SELECT `r`.`id`, `r2`.`id` + FROM `account`.`role` `r` + JOIN `account`.`role` `r2` ON `r2`.`name` = 'claimViewer' + WHERE `r`.`name` IN ( + 'salesPerson', + 'buyer', + 'deliveryBoss', + 'handmadeBoss' + ) DELETE FROM `salix`.`ACL` WHERE `model`= 'claim' - AND `property` = 'filter'; -DELETE FROM `salix`.`ACL` - WHERE `model`= 'claim' - AND `property` = 'find'; -DELETE FROM `salix`.`ACL` - WHERE `model`= 'claim' - AND `property` = 'findById'; -DELETE FROM `salix`.`ACL` - WHERE `model`= 'claim' - AND `property` = 'getSummary'; + AND `property` IN ( + 'filter', + 'find', + 'findById', + 'getSummary' + ); INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) - VALUES ('Claim','filter','READ','ALLOW','ROLE','claimViewer'); -INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) - VALUES ('Claim','find','READ','ALLOW','ROLE','claimViewer'); -INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) - VALUES ('Claim','findById','READ','ALLOW','ROLE','claimViewer'); -INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) - VALUES ('Claim','getSummary','READ','ALLOW','ROLE','claimViewer'); + SELECT 'Claim',`property`,'READ','ALLOW','ROLE','claimViewer' + FROM `salix`.`ACL` + WHERE `property` IN ( + 'filter', + 'find', + 'findById', + 'getSummary' + ) + GROUP BY `property`; -- 2.40.1 From c5006b6be685b23a96f1917f215f2c812385e03b Mon Sep 17 00:00:00 2001 From: pablone Date: Thu, 24 Aug 2023 11:31:12 +0200 Subject: [PATCH 3/3] refs #5881 insertAcl --- db/changes/233601/00-createClaimReader.sql | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/db/changes/233601/00-createClaimReader.sql b/db/changes/233601/00-createClaimReader.sql index b1accf329..666bf232e 100644 --- a/db/changes/233601/00-createClaimReader.sql +++ b/db/changes/233601/00-createClaimReader.sql @@ -22,12 +22,11 @@ DELETE FROM `salix`.`ACL` ); INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) - SELECT 'Claim',`property`,'READ','ALLOW','ROLE','claimViewer' - FROM `salix`.`ACL` - WHERE `property` IN ( - 'filter', - 'find', - 'findById', - 'getSummary' - ) - GROUP BY `property`; + VALUES ('Claim','filter','READ','ALLOW','ROLE','claimViewer'); +INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) + VALUES ('Claim','find','READ','ALLOW','ROLE','claimViewer'); +INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) + VALUES ('Claim','findById','READ','ALLOW','ROLE','claimViewer'); +INSERT INTO `salix`.`ACL` (`model`,`property`,`accessType`,`permission`,`principalType`,`principalid`) + VALUES ('Claim','getSummary','READ','ALLOW','ROLE','claimViewer'); + -- 2.40.1