New diagnostics for collection update problem with GraphQL

samply · Nov 18, 2024 · c0b4b3b · c0b4b3b
1 parent 74a3f59
commit c0b4b3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...directory_sync_service/directory/MergeDirectoryCollectionGetToDirectoryCollectionPut.java b/...directory_sync_service/directory/MergeDirectoryCollectionGetToDirectoryCollectionPut.java
@@ -53,6 +53,7 @@ public static boolean merge(DirectoryCollectionGet directoryCollectionGet, Direc
    * @return The DirectoryCollectionPut object with merged data, or null if an exception occurs.
    */
   private static DirectoryCollectionPut merge(String collectionId, DirectoryCollectionGet directoryCollectionGet, DirectoryCollectionPut directoryCollectionPut) {
+    logger.info("Merging DirectoryCollectionGet into DirectoryCollectionPut for collectionId: " + collectionId);
     try {
       directoryCollectionPut.setName(collectionId, directoryCollectionGet.getName(collectionId));
       directoryCollectionPut.setDescription(collectionId, directoryCollectionGet.getDescription(collectionId));

diff --git a/src/main/java/de/samply/directory_sync_service/directory/model/DirectoryCollectionGet.java b/src/main/java/de/samply/directory_sync_service/directory/model/DirectoryCollectionGet.java
@@ -107,8 +107,14 @@ public List<String> getNetworkIds(String id) {
     }
 
     public String getName(String id) {
-        if (!getItem(id).containsKey("name"))
+        if (getItem(id) == null) {
+            logger.warn("DirectoryCollectionGet.getName: item is null for id: " + id + ", aborting");
             return "";
+        }
+        if (!getItem(id).containsKey("name")) {
+            logger.warn("DirectoryCollectionGet.getName: no name key, aborting");
+            return "";
+        }
         return (String) getItem(id).get("name");
     }