From 4384074a8fca54335eb59d40757821f572c0f272 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 3 Apr 2020 16:46:01 +0200
Subject: [PATCH] Adding StorageHubg rules

---
 .../datamodel/validations/validators/TestRules.java  |  2 +-
 .../rules/StorageHub/StorageHub-createItem(FILE).csv |  3 +++
 .../StorageHub/StorageHub-createItem(FILE).json      | 12 ++++++++++++
 .../rules/StorageHub/StorageHub-getById.json         |  2 +-
 .../rules/StorageHub/StorageHub-getUsers.csv         |  3 +++
 .../rules/StorageHub/StorageHub-getUsers.json        | 12 ++++++++++++
 6 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 src/test/resources/rules/StorageHub/StorageHub-createItem(FILE).csv
 create mode 100644 src/test/resources/rules/StorageHub/StorageHub-createItem(FILE).json
 create mode 100644 src/test/resources/rules/StorageHub/StorageHub-getUsers.csv
 create mode 100644 src/test/resources/rules/StorageHub/StorageHub-getUsers.json

diff --git a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java
index 30ef705..6fa3d39 100644
--- a/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java
+++ b/src/test/java/org/gcube/accounting/datamodel/validations/validators/TestRules.java
@@ -220,7 +220,7 @@ public class TestRules extends ContextTest {
 		allRules();
 		File rulesDirectory = getRulesDirectory();
 		File rulesDirFile = new File(rulesDirectory, "StorageHub");
-		File ruleFile = new File(rulesDirFile, "StorageHub-findChildrenByNamePattern.json");
+		File ruleFile = new File(rulesDirFile, "StorageHub-createItem(FILE).json");
 		testRule(ruleFile);
 	}
 	
diff --git a/src/test/resources/rules/StorageHub/StorageHub-createItem(FILE).csv b/src/test/resources/rules/StorageHub/StorageHub-createItem(FILE).csv
new file mode 100644
index 0000000..c9b6943
--- /dev/null
+++ b/src/test/resources/rules/StorageHub/StorageHub-createItem(FILE).csv
@@ -0,0 +1,3 @@
+DataAccess,StorageHub,/item/create/byPath
+DataAccess,StorageHub,/workspace/items/bc1c9525-43f7-4565-b5ea-0a0f9d7853a0/create/FILE
+DataAccess,StorageHub,createItem(FILE)
\ No newline at end of file
diff --git a/src/test/resources/rules/StorageHub/StorageHub-createItem(FILE).json b/src/test/resources/rules/StorageHub/StorageHub-createItem(FILE).json
new file mode 100644
index 0000000..7e1ac92
--- /dev/null
+++ b/src/test/resources/rules/StorageHub/StorageHub-createItem(FILE).json
@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "StorageHub",
+		"calledMethodRegex": "(^\/workspace\/item(s){0,1}\/[0-9a-zA-Z\\-_]*\/create\/FILE$)|createItem\\(FILE\\)|(\/item\/create\/byPath)"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "StorageHub",
+		"calledMethod": "createItem(FILE)"
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/rules/StorageHub/StorageHub-getById.json b/src/test/resources/rules/StorageHub/StorageHub-getById.json
index 5c7a803..26425dc 100644
--- a/src/test/resources/rules/StorageHub/StorageHub-getById.json
+++ b/src/test/resources/rules/StorageHub/StorageHub-getById.json
@@ -2,7 +2,7 @@
 	"match": {
 		"serviceClassRegex": "DataAccess",
 		"serviceNameRegex": "StorageHub",
-		"calledMethodRegex": "^\/workspace(\/item(s){0,1}){0,1}\/(?!(i$)|count|i{0,1}t(h){0,1}rash|groups|paged|v(re|ere|er)fo(ld|dl)ers{0,1}|((C|c)hi(dl|ld|d)ren))[0-9a-zA-Z\\-_]{1,}(\/){0,1}$|getById"
+		"calledMethodRegex": "^\/workspace(\/item(s){0,1}){0,1}\/(?!(i$)|count|i{0,1}t(h){0,1}rash|group(s){0,1}|user(s){0,1}|paged|v(re|ere|er)fo(ld|dl)ers{0,1}|((C|c)hi(dl|ld|d)ren))[0-9a-zA-Z\\-_]{1,}(\/){0,1}$|getById"
 	},
 	"replace": {
 		"serviceClass": "DataAccess",
diff --git a/src/test/resources/rules/StorageHub/StorageHub-getUsers.csv b/src/test/resources/rules/StorageHub/StorageHub-getUsers.csv
new file mode 100644
index 0000000..a07b2ea
--- /dev/null
+++ b/src/test/resources/rules/StorageHub/StorageHub-getUsers.csv
@@ -0,0 +1,3 @@
+DataAccess,StorageHub,/workspace/users
+DataAccess,StorageHub,/workspace/users/lucio.lelii
+DataAccess,StorageHub,/workspace/users/ngalante
\ No newline at end of file
diff --git a/src/test/resources/rules/StorageHub/StorageHub-getUsers.json b/src/test/resources/rules/StorageHub/StorageHub-getUsers.json
new file mode 100644
index 0000000..611508b
--- /dev/null
+++ b/src/test/resources/rules/StorageHub/StorageHub-getUsers.json
@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "StorageHub",
+		"calledMethodRegex": "^\/workspace\/user(s){0,1}\/{0,1}.*|getUsers"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "StorageHub",
+		"calledMethod": "getUsers"
+	}
+}
\ No newline at end of file