chore(avs): fix #34 by scheduling avs background updates

config/settings.yml

@@ -81,8 +81,11 @@ health-check-ldap-admins-timeout: "_env:HEALTHCHECK_LDAP_ADMINS_TIMEOUT:60"
 health-check-http-reachable-timeout: "_env:HEALTHCHECK_HTTP_REACHABLE_TIMEOUT:2"
 health-check-matching-cluster-config-timeout: "_env:HEALTHCHECK_MATCHING_CLUSTER_CONFIG_TIMEOUT:2"
 
-synchronise-ldap-users-within: "_env:SYNCHRONISE_LDAP_WITHIN:1209600"
+synchronise-ldap-users-within: "_env:SYNCHRONISE_LDAP_WITHIN:1209600"   # 14 Tage in Sekunden
-synchronise-ldap-users-interval: "_env:SYNCHRONISE_LDAP_INTERVAL:3600"
+synchronise-ldap-users-interval: "_env:SYNCHRONISE_LDAP_INTERVAL:3600"  # jede Stunde
+
+synchronise-avs-users-within: "_env:SYNCHRONISE_AVS_WITHIN:5702400"     # alle 66 Tage
+synchronise-avs-users-interval: "_env:SYNCHRONISE_AVS_INTERVAL:21600"   # alle 6 Stunden
 
 study-features-recache-relevance-within: 172800
 study-features-recache-relevance-interval: 293

src/Handler/Admin.hs

@@ -56,7 +56,8 @@ getAdminProblemsR = do
     (Left e) -> return $ Left $ text2widget $ tshow (e :: SomeException)
     (Right AvsLicenceDifferences{..}) -> do
       let problemIds = avsLicenceDiffRevokeAll <> avsLicenceDiffGrantVorfeld <> avsLicenceDiffRevokeRollfeld <> avsLicenceDiffGrantRollfeld
-      mapM_  (queueJob' . flip JobSynchroniseAvsId cutOffAvsSynch) problemIds
+      -- mapM_  (queueJob' . flip JobSynchroniseAvsId cutOffAvsSynch) problemIds
+      runDBJobs . forM_ problemIds $ queueDBJob . flip JobSynchroniseAvsId cutOffAvsSynch      
       return $ Right
         ( Set.size avsLicenceDiffRevokeAll
         , Set.size avsLicenceDiffGrantVorfeld

src/Jobs/Crontab.hs

@@ -332,6 +332,30 @@ determineCrontab = execWriterT $ do
       | otherwise
        -> return ()
 
+    if
+      | is _Just appAvsConf
+      , Just syncWithin <- appSynchroniseAvsUsersWithin
+      , Just cInterval <- appJobCronInterval
+        -> do
+          nextIntervals <- getNextIntervals syncWithin appSynchroniseAvsUsersInterval cInterval
+
+          forM_ nextIntervals $ \(nextEpoch, nextInterval, nextIntervalTime, numIntervals) -> do
+            tell $ HashMap.singleton
+              (JobCtlQueue JobSynchroniseAvs
+                 { jEpoch         = fromInteger nextEpoch
+                 , jNumIterations = fromInteger numIntervals
+                 , jIteration     = fromInteger nextInterval
+                 , jSynchAfter    = Nothing
+                 })
+              Cron
+                { cronInitial   = CronTimestamp $ utcToLocalTimeTZ appTZ nextIntervalTime
+                , cronRepeat    = CronRepeatNever
+                , cronRateLimit = appSynchroniseLdapUsersInterval
+                , cronNotAfter  = Right . CronTimestamp . utcToLocalTimeTZ appTZ $ addUTCTime appSynchroniseAvsUsersInterval nextIntervalTime
+                }
+      | otherwise
+       -> return ()
+
     whenIsJust ((,) <$> appPruneUnreferencedFilesWithin <*> appJobCronInterval) $ \(within, cInterval) -> do
       nextIntervals <- getNextIntervals within appPruneUnreferencedFilesInterval cInterval
       forM_ nextIntervals $ \(nextEpoch, nextInterval, nextIntervalTime, numIntervals) -> do

src/Jobs/Types.hs

@@ -89,6 +89,11 @@ data Job
                               , jIteration :: Natural
                               }
   | JobSynchroniseLdapUser    { jUser :: UserId }
+  | JobSynchroniseAvs         { jNumIterations
+                              , jEpoch
+                              , jIteration :: Natural
+                              , jSynchAfter :: Maybe UTCTime
+                              }
   | JobSynchroniseAvsUser     { jUser :: UserId
                               , jSynchAfter :: Maybe UTCTime
                               }

src/Settings.hs

@@ -165,6 +165,9 @@ data AppSettings = AppSettings
     , appSynchroniseLdapUsersWithin :: Maybe NominalDiffTime
     , appSynchroniseLdapUsersInterval :: NominalDiffTime
 
+    , appSynchroniseAvsUsersWithin :: Maybe NominalDiffTime
+    , appSynchroniseAvsUsersInterval :: NominalDiffTime
+
     , appLdapReTestFailover :: DiffTime
 
     , appSessionFilesExpire     :: NominalDiffTime
@@ -690,9 +693,12 @@ instance FromJSON AppSettings where
 
         appSessionTimeout         <- o .: "session-timeout"
 
-        appSynchroniseLdapUsersWithin <- o .:? "synchronise-ldap-users-within"
+        appSynchroniseLdapUsersWithin   <- o .:? "synchronise-ldap-users-within"
         appSynchroniseLdapUsersInterval <- o .:  "synchronise-ldap-users-interval"
 
+        appSynchroniseAvsUsersWithin    <- o .:? "synchronise-avs-users-within"
+        appSynchroniseAvsUsersInterval  <- o .:  "synchronise-avs-users-interval"
+
         appLdapReTestFailover     <- o .:  "ldap-re-test-failover"
 
         appSessionFilesExpire     <- o .:  "session-files-expire"