Merge pull request #741 from folio-org/release_6.1.1

Release 6.1.1

.gitignore

@@ -3,3 +3,8 @@
 !/.okapi
 .DS_Store
 /bin/
+
+## There are a lot of extra files created when running the docker compose,
+## only keep the .keep files
+tools/testing/zk-single-kafka-single
+!.keep

NEWS.md

@@ -1,3 +1,7 @@
+## 6.1.1 2024-04-01
+  * ERM-3177 Check on `noSICount` in WorkSourceIdentifierTIRSImpl is not correct
+  * ERM-3139 Propose additional info.log messages for jobs/processes
+
 ## 6.1.0 2024-03-04
   * ERM-3156 Backport GOKb harvest performance and process fixes to Poppy compatible releases
     * ERM-3154 Consolidate package upsert summary logging in info log

service/gradle.properties

@@ -5,7 +5,7 @@ gorm.version=7.3.3
 
 # Application
 appName=mod-agreements
-appVersion=6.1.0
+appVersion=6.1.1
 dockerTagSuffix=
 dockerRepo=folioci
 

service/grails-app/services/org/olf/KbHarvestService.groovy

@@ -260,7 +260,7 @@ where rkb.type is not null
       // This might ought to be in debug to bring in line with other methods in here, 
       // although it might be more useful to know it happened since the call log above is "debug" level
       // Default logback config has this service at "DEBUG" level anyway so it might not matter.
-			log.warn("KBHarvestService::handleInterruptedJob() completed");
+			log.info("KBHarvestService::handleInterruptedJob() completed");
 		}
 	}
 }

service/src/main/groovy/org/olf/dataimport/internal/titleInstanceResolvers/WorkSourceIdentifierTIRSImpl.groovy

@@ -45,13 +45,19 @@ class WorkSourceIdentifierTIRSImpl extends IdFirstTIRSImpl implements DataBinder
         return false;
       }
 
+      // This assumes that IdentiferOccurrences can only be attached to Works as the sourceIdentifier.
+      // If this changes then rework will be needed.
       long noSICount = Work.executeQuery("""
-        SELECT COUNT(w) FROM Work w WHERE w.sourceIdentifier = null
-      """.toString())?.get(0);
+        SELECT COUNT(w) FROM Work w
+        LEFT JOIN IdentifierOccurrence io ON io.resource = w.id
+        WHERE io.id = null
+        """.toString())?.get(0);
 
+/*
       long workCount = Work.executeQuery("""
         SELECT COUNT(w) FROM Work w
       """.toString())?.get(0);
+*/
 
       // For now keep the fallback unless there are NO Works in the system without SI
       if (noSICount == 0) {
@@ -74,7 +80,6 @@ class WorkSourceIdentifierTIRSImpl extends IdFirstTIRSImpl implements DataBinder
     // Error out if sourceIdentifier or sourceIdentifierNamespace do not exist
     ensureSourceIdentifierFields(citation);
 
-    // TODO Check this works with the switch to grabbing only id
     List<String> candidate_works = Work.executeQuery("""
       SELECT w.id FROM Work as w
       WHERE