From be527ada321b6f3c4fe08e44a4ca11a1bb39eea3 Mon Sep 17 00:00:00 2001
From: Steffen Jost <S.Jost@Fraport.de>
Date: Fri, 6 Oct 2023 15:07:34 +0000
Subject: [PATCH] refactor: minor code cleaning

---
 src/Jobs/Handler/LMS.hs                            |  9 ++++-----
 src/Jobs/Handler/SendNotification/Qualification.hs | 10 +++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Jobs/Handler/LMS.hs b/src/Jobs/Handler/LMS.hs
index 1b6cf4359..827f44496 100644
--- a/src/Jobs/Handler/LMS.hs
+++ b/src/Jobs/Handler/LMS.hs
@@ -197,14 +197,13 @@ dispatchJobLmsDequeue qid = JobHandlerAtomic act
                               luser E.?. LmsUserUser           E.?=. quser   E.^. QualificationUserUser
                         E.&&. luser E.?. LmsUserQualification  E.?=. quser   E.^. QualificationUserQualification)
           E.where_ $ quser E.^. QualificationUserQualification E.==. E.val qid
-              -- E.&&.  luser E.?. LmsUserQualification           E.?=. E.val qid
+              -- E.&&.  luser E.?. LmsUserQualification        E.?=. E.val qid
               -- E.&&.  E.isNothing (luser E.^. LmsUserStatus)
               -- E.&&.  E.isNothing (luser E.^. LmsUserEnded)
               E.&&.  E.not_ (validQualification now quser)
-          pure (luser E.?. LmsUserId, quser E.^. QualificationUserUser)          
-      nrBlocked <- qualificationUserBlocking qid (E.unValue . snd <$> expiredUsers) False (Just now) (Right QualificationBlockExpired) True -- essential that blocks occur only once
-      let expiredLearners = [ luid | (E.Value (Just luid), _) <- expiredUsers ]
-      -- let expiredLearners = catMaybes (E.unValue . fst <$> expiredUsers)
+          pure (quser E.^. QualificationUserUser, luser E.?. LmsUserId)
+      nrBlocked <- qualificationUserBlocking qid (E.unValue . fst <$> expiredUsers) False (Just now) (Right QualificationBlockExpired) True -- essential that blocks occur only once
+      let expiredLearners = [luid | (_, E.Value (Just luid)) <- expiredUsers]
       nrExpired <- E.updateCount $ \luser -> do
         E.set luser [LmsUserStatus E.=. E.justVal LmsExpired, LmsUserStatusDay E.=. E.justVal now]
         E.where_ $ E.isNothing (luser E.^. LmsUserStatus)
diff --git a/src/Jobs/Handler/SendNotification/Qualification.hs b/src/Jobs/Handler/SendNotification/Qualification.hs
index d5338acf6..d5d8d595e 100644
--- a/src/Jobs/Handler/SendNotification/Qualification.hs
+++ b/src/Jobs/Handler/SendNotification/Qualification.hs
@@ -60,7 +60,7 @@ dispatchNotificationQualificationExpired nQualification jRecipient = do
       let expDay  = maybe qualificationUserValidUntil (min qualificationUserValidUntil . utctDay . qualificationUserBlockFrom) block
           qname   = CI.original qualificationName
           qshort  = CI.original qualificationShorthand
-          letter  = LetterExpireQualification 
+          letter  = LetterExpireQualification
             { leqHolderCFN  = encRecShort
             , leqHolderID   = jRecipient
             , leqHolderDN   = userDisplayName
@@ -72,14 +72,14 @@ dispatchNotificationQualificationExpired nQualification jRecipient = do
             , leqSchool     = qualificationSchool
             , leqUrl        = pure . urender $ ForProfileDataR encRecipient
             }
-      if expDay > utctDay qualificationUserLastNotified 
+      if expDay > utctDay qualificationUserLastNotified
         then do
           notifyOk <- sendEmailOrLetter jRecipient letter
           if notifyOk
-            then do               
+            then do
               runDB $ update quId [QualificationUserLastNotified =. now]
               $logInfoS  "LMS" $ "Notified " <> tshow encRecipient <> " about expired qualification " <> qname
-            else 
+            else
               $logErrorS "LMS" $ "Failed to notify " <> tshow encRecipient <> " about expired qualification " <> qname
         else  $logErrorS "LMS" $ "Suppressed repeated notification " <> tshow encRecipient <> " about expired qualification " <> qname
     _ ->  $logErrorS "LMS" $ "Failed to notify " <> tshow encRecipient <> " about expired qualification " <> tshow nQualification
@@ -89,7 +89,7 @@ dispatchNotificationQualificationExpired nQualification jRecipient = do
 dispatchNotificationQualificationRenewal :: QualificationId -> Bool -> UserId -> Handler ()
 dispatchNotificationQualificationRenewal nQualification nReminder jRecipient = do
   encRecipient :: CryptoUUIDUser <- encrypt jRecipient
-  query <- runDB $ (,,,) 
+  query <- runDB $ (,,,)
     <$> get jRecipient
     <*> get nQualification
     <*> getBy (UniqueQualificationUser    nQualification jRecipient)