fix bulk update, import endYear handling, roles update & list udpate …

server/grails-app/conf/application.groovy

@@ -57,6 +57,7 @@ grails.plugin.springsecurity.controllerAnnotations.staticRules = [
   [pattern: '/register/start',                access: ['permitAll']],
   [pattern: '/register/forgotPassword',       access: ['permitAll']],
   [pattern: '/register/forgotPasswordExt',    access: ['permitAll']],
+  [pattern: '/register/resetPasswordExt',     access: ['permitAll']],
   [pattern: '/public/**',                     access: ["hasAnyRole('ROLE_ADMIN', 'ROLE_POWERUSER') and isFullyAuthenticated()"]],
   [pattern: '/package/**',                    access: ['permitAll']],
   [pattern: '/packages/**',                   access: ['permitAll']],
@@ -379,6 +380,8 @@ globalSearchTemplates = [
         [heading:'Primary URL', property:'primaryUrl'],
         [heading:'Provider', property:'provider?.name', link:true],
         [heading:'Status', property:'status?.value',sort:'status'],
+        [heading:'Date Created', property:'dateCreated',sort:'dateCreated'],
+        [heading:'Last Updated', property:'lastUpdated',sort:'lastUpdated'],
       ]
     ]
   ],

server/grails-app/controllers/org/gokb/AdminController.groovy

@@ -31,6 +31,7 @@ class AdminController {
   def uploadAnalysisService
   def jobManagerService
   def curatoryGroupAlertingService
+  def orgRolesService
   CleanupService cleanupService
   ConcurrencyManagerService concurrencyManagerService
   TippService tippService
@@ -571,6 +572,14 @@ class AdminController {
     render(view: "logViewer", model: logViewer())
   }
 
+  def addMissingOrgRoles() {
+    log.debug("Adding missing Org roles based on existing component links")
+
+    def result = orgRolesService.addMissingRoles()
+
+    render result as JSON
+  }
+
 
   def setupAcl() {
 

server/grails-app/controllers/org/gokb/IntegrationController.groovy

@@ -302,11 +302,14 @@ class IntegrationController {
     def user = springSecurityService.currentUser
     def assert_errors = false;
     def jsonOrg = request.JSON
+    boolean fullsync = false
+
+    if (params.fullsync == "true" && user.adminStatus) {
+      fullsync = true
+    }
 
     try {
       Org.withTransaction {
-
-
         Org located_or_new_org
 
         if (jsonOrg.uuid) {
@@ -436,6 +439,8 @@ class IntegrationController {
 
         // roles
         log.debug("Role Processing: ${jsonOrg.roles}");
+        def existing_roles = located_or_new_org.roles
+
         jsonOrg.roles.each { r ->
           log.debug("Adding role ${r}");
           def role = RefdataCategory.lookup("Org.Role", r)
@@ -445,8 +450,16 @@ class IntegrationController {
           }
         }
 
+        if (fullsync) {
+          existing_roles.each { r ->
+            if (!jsonOrg.roles.contains(r.value)) {
+              located_or_new_org.removeFromRoles(r)
+            }
+          }
+        }
+
         // Core data...
-        componentUpdateService.ensureCoreData(located_or_new_org, jsonOrg, false, user)
+        componentUpdateService.ensureCoreData(located_or_new_org, jsonOrg, fullsync, user)
 
         log.debug("Attempt to save - validate: ${located_or_new_org}");
 

server/grails-app/services/org/gokb/BulkPackageImportService.groovy

@@ -323,7 +323,7 @@ class BulkPackageImportService {
         // No end year
       }
       else if (cobj.end_year instanceof Integer) {
-        if (cobj.end_year < 1700 || cobj.start_year > 9999) {
+        if (cobj.end_year < 1700 || cobj.end_year > 9999) {
           errors['end_year'] = [message: "Package years must be between 1700 and 9999!"]
         }
         else if (!cobj.start_year) {

server/grails-app/services/org/gokb/ComponentUpdateService.groovy

@@ -153,11 +153,11 @@ class ComponentUpdateService {
             def new_variant_name = component.ensureVariantName(variant.variantName, type, locale)
           }
         }
-        else if (variant instanceof String && variant.trim() && !variants.find { it.variantName == name }) {
+        else if (variant instanceof String && variant.trim() && !variants.find { it.variantName == variant }) {
           // Add the variant name.
-          log.debug("Adding variantName ${name} to ${component} ..")
+          log.debug("Adding variantName ${variant} to ${component} ..")
 
-          def new_variant_name = component.ensureVariantName(name)
+          def new_variant_name = component.ensureVariantName(variant)
 
           // Add to collection.
           if (new_variant_name) {
@@ -333,6 +333,11 @@ class ComponentUpdateService {
         }
       }
     }
+
+    if (hasChanged) {
+      component.lastSeen = new Date().getTime()
+    }
+
     hasChanged
   }
 
@@ -355,7 +360,7 @@ class ComponentUpdateService {
     def pkg = null
 
     if (params.pkg) {
-      pkg = Package.get(params.int('pkg'))
+      pkg = Package.findByUuid(params.pkg) ?: Package.get(params.int('pkg'))
 
       if (!pkg) {
         result.result = 'ERROR'
@@ -374,7 +379,7 @@ class ComponentUpdateService {
 
       def items = componentLookupService.restLookup(user, cls, params, null, true).data
 
-      if (cls == TitleInstancePackagePlatform && tipps_pkg && field == 'status') {
+      if (cls == TitleInstancePackagePlatform && pkg && field == 'status') {
         def status_rdv = params.int('_value') ? RefdataValue.get(params.int('_value')) : RefdataCategory.lookup('KBComponent.Status', params['_value'])
 
         if (pkg && isUserCurator(pkg, user) && status_rdv?.owner?.label == 'KBComponent.Status') {

server/grails-app/services/org/gokb/EzbCollectionService.groovy

@@ -213,6 +213,7 @@ class EzbCollectionService {
             def date_changed = item.ezb_collection_deactivated_date.substring(0, 10) + ' 00:00:00'
 
             obj.retireAt(dateFormatService.parseTimestamp(date_changed))
+            obj.save(flush: true)
 
             result.report[ARCHIVED_TYPE].retired++
           }

server/grails-app/services/org/gokb/OrgRolesService.groovy

@@ -0,0 +1,49 @@
+package org.gokb
+
+import org.gokb.cred.*
+
+class OrgRolesService {
+
+  public Map addMissingRoles() {
+    Map result = [new_providers: 0, new_publishers: 0]
+    RefdataValue status_current = RefdataCategory.lookup(KBComponent.RD_STATUS, KBComponent.STATUS_CURRENT)
+    RefdataValue rdv_publisher = RefdataCategory.lookup('Org.Role', 'Publisher')
+    RefdataValue rdv_platform_provider = RefdataCategory.lookup('Org.Role', 'Platform Provider')
+    RefdataValue combo_publisher = RefdataCategory.lookup('Combo.Type', 'TitleInstance.Publisher')
+    RefdataValue combo_plt_provider = RefdataCategory.lookup('Combo.Type', 'Platform.Provider')
+
+    def qry_string = '''from Org as o
+                        where status = :sc
+                        and exists (
+                          select 1 from Combo
+                          where (
+                            fromComponent = o
+                            or toComponent = o
+                          )
+                          and type = :ct
+                        )
+                        and :rp not member of o.roles'''
+
+    List missing_provider_orgs = Org.executeQuery(qry_string, [sc: status_current, ct: combo_plt_provider, rp: rdv_platform_provider])
+
+    missing_provider_orgs.each { org ->
+      org.addToRoles(rdv_platform_provider)
+      org.lastSeen = System.currentTimeMillis()
+      org.save(flush: true)
+    }
+
+    result.new_providers = missing_provider_orgs.size()
+
+    List missing_publisher_orgs = Org.executeQuery(qry_string, [sc: status_current, ct: combo_publisher, rp: rdv_publisher])
+
+    missing_publisher_orgs.each { org ->
+      org.addToRoles(rdv_publisher)
+      org.lastSeen = System.currentTimeMillis()
+      org.save(flush: true)
+    }
+
+    result.new_publishers = missing_publisher_orgs.size()
+
+    return result
+  }
+}

server/grails-app/services/org/gokb/TippService.groovy

@@ -845,13 +845,15 @@ class TippService {
   }
 
   public Boolean hasOpenReviews(pid) {
+    int total = 0
+
     ReviewRequest.withNewSession {
       RefdataValue status_open = RefdataCategory.lookup("ReviewRequest.Status", "Open")
       RefdataValue combo_tipps = RefdataCategory.lookup("Combo.Type", "Package.Tipps")
       RefdataValue manual_review_type = RefdataCategory.lookup("ReviewRequest.StdDesc", 'Manual Request')
 
       def qry = '''select count(*) from ReviewRequest as rr
-                    where (
+                    where ((
                       rr.componentToReview.id = :pid
                       and rr.stdDesc != :mr
                     )
@@ -865,13 +867,13 @@ class TippService {
                           and type = :ct
                         )
                       )
-                    )
+                    ))
                     and rr.status = :so'''
 
-      def total = ReviewRequest.executeQuery(qry, [pid: pid, mr: manual_review_type, ct: combo_tipps, so: status_open])[0]
-
-      return total > 0
+      total = ReviewRequest.executeQuery(qry, [pid: pid, mr: manual_review_type, ct: combo_tipps, so: status_open])[0]
     }
+
+    return total > 0
   }
 
   @Transactional

server/src/integration-test/groovy/org/gokb/BulkImportSpec.groovy

@@ -174,6 +174,7 @@ class BulkImportSpec extends Specification {
                 package_created_date: null,
                 package_changed_date: null,
                 start_year: 2025,
+                end_year: 2025,
                 other_package_identifiers: [
                   [
                     namespace: 'isil',

server/src/main/groovy/org/gokb/IngestKbartRun.groovy

@@ -943,7 +943,7 @@ class IngestKbartRun {
       log.debug("TIPP ${tipp.id} info check: ${tipp.name}, ${tipp.url}")
 
       if (tipp.validate()) {
-        if (ingest_systime) {
+        if (ingest_systime && ingest_systime > tipp.lastSeen) {
           log.debug("Update last seen on tipp ${tipp.id} - set to ${ingest_date} (${tipp.lastSeen} -> ${ingest_systime})")
           tippService.updateLastSeen(tipp, ingest_systime)
         }