From 9f366ad4ad196ef21d26011b7ce7ca53372972bd Mon Sep 17 00:00:00 2001
From: "luca.frosini" <luca.frosini@192.168.1.78>
Date: Thu, 20 Jul 2023 15:21:45 +0200
Subject: [PATCH] Improved logging

---
 .../storagehub/StorageHubManagement.java      | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/gcube/storagehub/StorageHubManagement.java b/src/main/java/org/gcube/storagehub/StorageHubManagement.java
index 59ca280..f347e7c 100644
--- a/src/main/java/org/gcube/storagehub/StorageHubManagement.java
+++ b/src/main/java/org/gcube/storagehub/StorageHubManagement.java
@@ -142,14 +142,17 @@ public class StorageHubManagement {
 		return destinationFolder;
 	}
 	
-	protected boolean checkMetadata(FileContainer fileContainer) {
+	protected boolean isPersistedFile(FileContainer fileContainer, String filename) {
 		// Checking if the file is already a persisted file of the workspace
-		if(metadataMatcher != null) {
-			Metadata metadata = fileContainer.get().getMetadata();
-			return metadataMatcher.check(metadata);
-		} else {
-			return true;
+		if(fileContainer.get().getName().startsWith(filename)) {
+			if(metadataMatcher != null) {
+				Metadata metadata = fileContainer.get().getMetadata();
+				return metadataMatcher.check(metadata);
+			} else {
+				return true;
+			}
 		}
+		return false;
 	}
 	
 	protected void logItem(ItemContainer<? extends Item> itemContainer) {
@@ -193,7 +196,9 @@ public class StorageHubManagement {
 		List<ItemContainer<? extends Item>> itemContainers = listResolver.withMetadata().getContainers();
 		for(ItemContainer<? extends Item> itemContainer : itemContainers) {
 			if(itemContainer.getType()==ContainerType.FILE) {
-				if(checkMetadata((FileContainer) itemContainer)) {
+				if(isPersistedFile((FileContainer) itemContainer, filename)) {
+					logger.debug("The file with mimetype {} and name {} was found in the expected folder (i.e. id:{}, path:{}) and the check on metadata succeded. The file is the one expected.", 
+							mimeType, filename, destinationFolder.getId(), destinationFolder.get().getPath());
 					this.persitedFile = (FileContainer) itemContainer;
 					return this.persitedFile;
 				}else {
@@ -210,6 +215,7 @@ public class StorageHubManagement {
 	public void removePersistedFile(String filename, String mimeType) throws Exception {
 		persitedFile = getPersistedFile(filename, mimeType);
 		if(persitedFile !=null) {
+			logger.info("Persited file with mimetype {} and name {} was found. Goign to remove it.", mimeType, filename);
 			persitedFile.delete();
 		}
 	}