From e73126d5c2ae95c927e7e00af4724bc15e4e58d1 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 3 Apr 2020 15:34:15 +0200
Subject: [PATCH] Adding rules for StorageHub

---
 .../datamodel/validations/validators/TestRules.java  |  2 +-
 .../rules/StorageHub/StorageHub-countById.csv        |  2 ++
 .../rules/StorageHub/StorageHub-countById.json       | 12 ++++++++++++
 .../rules/StorageHub/StorageHub-getById.csv          |  8 ++++++++
 .../rules/StorageHub/StorageHub-getById.json         | 12 ++++++++++++
 .../rules/StorageHub/StorageHub-listById.csv         |  1 +
 6 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 src/test/resources/rules/StorageHub/StorageHub-countById.csv
 create mode 100644 src/test/resources/rules/StorageHub/StorageHub-countById.json
 create mode 100644 src/test/resources/rules/StorageHub/StorageHub-getById.csv
 create mode 100644 src/test/resources/rules/StorageHub/StorageHub-getById.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 0d61b34..e9a4300 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-getVreFolderRecents.json");
+		File ruleFile = new File(rulesDirFile, "StorageHub-getById.json");
 		testRule(ruleFile);
 	}
 	
diff --git a/src/test/resources/rules/StorageHub/StorageHub-countById.csv b/src/test/resources/rules/StorageHub/StorageHub-countById.csv
new file mode 100644
index 0000000..093b077
--- /dev/null
+++ b/src/test/resources/rules/StorageHub/StorageHub-countById.csv
@@ -0,0 +1,2 @@
+DataAccess,StorageHub,/workspace/count
+DataAccess,StorageHub,countById
diff --git a/src/test/resources/rules/StorageHub/StorageHub-countById.json b/src/test/resources/rules/StorageHub/StorageHub-countById.json
new file mode 100644
index 0000000..469744d
--- /dev/null
+++ b/src/test/resources/rules/StorageHub/StorageHub-countById.json
@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "StorageHub",
+		"calledMethodRegex": "(\/workspace\/count)|countById"
+	},
+	"replace": {
+		"serviceClass": "DataAccess",
+		"serviceName": "StorageHub",
+		"calledMethod": "countById"
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/rules/StorageHub/StorageHub-getById.csv b/src/test/resources/rules/StorageHub/StorageHub-getById.csv
new file mode 100644
index 0000000..0fef1ac
--- /dev/null
+++ b/src/test/resources/rules/StorageHub/StorageHub-getById.csv
@@ -0,0 +1,8 @@
+DataAccess,StorageHub,/workspace/40a3dd6c-2c47-4848-bb7b-462e532954a9/
+DataAccess,StorageHub,/workspace/cb6a04d1-f94b-4c2f-90ed-18c1cee591bc
+DataAccess,StorageHub,/workspace/item/29d9a102-802b-4775-b80d-a42730c643cb/
+DataAccess,StorageHub,/workspace/item/40a3dd6c-2c47-4848-bb7b-462e532954a9/
+DataAccess,StorageHub,/workspace/item/c99d26b6-e0bb-4a48-b32a-77056f49ddeb
+DataAccess,StorageHub,/workspace/item/da558346-7d1a-4159-8780-a22e63f3c7dc/
+DataAccess,StorageHub,/workspace/items/87bea023-3eed-445b-8c27-4d9d4e5921cc
+DataAccess,StorageHub,getById
\ 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
new file mode 100644
index 0000000..1a454ff
--- /dev/null
+++ b/src/test/resources/rules/StorageHub/StorageHub-getById.json
@@ -0,0 +1,12 @@
+{
+	"match": {
+		"serviceClassRegex": "DataAccess",
+		"serviceNameRegex": "StorageHub",
+		"calledMethodRegex": "^\/workspace(\/item(s){0,1}){0,1}\/(?!(i$)|count|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",
+		"serviceName": "StorageHub",
+		"calledMethod": "getById"
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/rules/StorageHub/StorageHub-listById.csv b/src/test/resources/rules/StorageHub/StorageHub-listById.csv
index 900bd25..5305141 100644
--- a/src/test/resources/rules/StorageHub/StorageHub-listById.csv
+++ b/src/test/resources/rules/StorageHub/StorageHub-listById.csv
@@ -1,5 +1,6 @@
 DataAccess,StorageHub,/list/byId
 DataAccess,StorageHub,/list/byPath
+DataAccess,StorageHub,/workspace/0ea656f2-0b86-411b-9711-00dba6261738/children
 DataAccess,StorageHub,/workspace/a805998e-fa5a-4185-809c-72666f5f7ca7/chidlren
 DataAccess,StorageHub,/workspace/a805998e-fa5a-4185-809c-72666f5f7ca7/children
 DataAccess,StorageHub,/workspace/bc1c9525-43f7-4565-b5ea-0a0f9d7853a0/children