From eba437de33ba463574abf3ea7a2a14993e0854fb Mon Sep 17 00:00:00 2001
From: Steffen Jost <S.Jost@Fraport.de>
Date: Fri, 28 Apr 2023 11:15:51 +0000
Subject: [PATCH] refactor(csv): change new user default to xlsx working now

---
 src/Handler/LMS/Users.hs | 3 ++-
 src/Handler/SAP.hs       | 3 ++-
 src/Handler/Utils/LMS.hs | 3 ++-
 src/Model/Types/Csv.hs   | 2 +-
 src/Utils/Users.hs       | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Handler/LMS/Users.hs b/src/Handler/LMS/Users.hs
index 5af247638..9a0eb8e96 100644
--- a/src/Handler/LMS/Users.hs
+++ b/src/Handler/LMS/Users.hs
@@ -177,7 +177,8 @@ getLmsUsersDirectR sid qsh = do
       --csvRenderedHeader = lmsUserTableCsvHeader
       --cvsRendered = CsvRendered {..}
       csvRendered = toCsvRendered lmsUserTableCsvHeader $ lmsUser2csv cutoff . entityVal <$> lms_users
-      fmtOpts = def { csvIncludeHeader  = lmsDownloadHeader
+      fmtOpts = (review csvPreset CsvPresetRFC)
+                    { csvIncludeHeader  = lmsDownloadHeader
                     , csvDelimiter      = lmsDownloadDelimiter
                     , csvUseCrLf        = lmsDownloadCrLf
                     }
diff --git a/src/Handler/SAP.hs b/src/Handler/SAP.hs
index 5365b00fd..79e69d222 100644
--- a/src/Handler/SAP.hs
+++ b/src/Handler/SAP.hs
@@ -97,7 +97,8 @@ getQualificationSAPDirectR = do
       , qual      Ex.^. QualificationSapId
       )    
   let csvRendered = toCsvRendered sapUserTableCsvHeader $ sapRes2csv qualUsers
-      fmtOpts = def { csvIncludeHeader  = True
+      fmtOpts = (review csvPreset CsvPresetRFC)
+                    { csvIncludeHeader  = True
                     , csvDelimiter      = ','
                     , csvUseCrLf        = True
                     }
diff --git a/src/Handler/Utils/LMS.hs b/src/Handler/Utils/LMS.hs
index 8d05b5618..680a75b40 100644
--- a/src/Handler/Utils/LMS.hs
+++ b/src/Handler/Utils/LMS.hs
@@ -45,7 +45,8 @@ getLmsCsvDecoder :: (MonadHandler m, HandlerSite m ~ UniWorX, MonadThrow m, From
 getLmsCsvDecoder = do
   LmsConf{..} <- getsYesod $ view _appLmsConf
   if  | Just upDelim <- lmsUploadDelimiter -> do
-        let fmtOpts = def { csvDelimiter     = upDelim
+        let fmtOpts = (review csvPreset CsvPresetRFC)
+                          { csvDelimiter     = upDelim
                           , csvIncludeHeader = lmsUploadHeader
                           }
             csvOpts = def { csvFormat = fmtOpts }
diff --git a/src/Model/Types/Csv.hs b/src/Model/Types/Csv.hs
index b859ab0ee..62ac641e1 100644
--- a/src/Model/Types/Csv.hs
+++ b/src/Model/Types/Csv.hs
@@ -85,7 +85,7 @@ instance Default CsvOptions where
     }
 
 instance Default CsvFormatOptions where
-  def = CsvXlsxFormatOptions -- csvPreset # CsvPresetRFC
+  def = csvPreset # CsvPresetRFC -- changing the default here to CsvPresetXlsx will cause internal server errors to to partial record selectors failing
 
 data CsvPreset = CsvPresetRFC
                | CsvPresetXlsx
diff --git a/src/Utils/Users.hs b/src/Utils/Users.hs
index 36721dd7c..2339fbed5 100644
--- a/src/Utils/Users.hs
+++ b/src/Utils/Users.hs
@@ -73,7 +73,7 @@ addNewUser AddUserData{..} = do
       , userExamOfficeGetLabels     = userDefaultExamOfficeGetLabels
       , userNotificationSettings    = def
       , userLanguages               = Nothing
-      , userCsvOptions              = def
+      , userCsvOptions              = def { csvFormat = review csvPreset CsvPresetXlsx }
       , userTokensIssuedAfter       = Nothing
       , userCreated                 = now
       , userLastLdapSynchronisation = Nothing