From 62e282f1361f97a29fbfba08bf7a6216a7d6aa72 Mon Sep 17 00:00:00 2001
From: Filip Gralinski <filipg@amu.edu.pl>
Date: Sat, 17 Nov 2018 09:49:25 +0100
Subject: [PATCH] Convert a boolean value to a non-maybe

---
 Handler/EditSubmission.hs        | 2 +-
 Handler/ShowChallenge.hs         | 4 ++--
 Handler/Tables.hs                | 2 +-
 config/models                    | 2 +-
 templates/edit-submission.hamlet | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Handler/EditSubmission.hs b/Handler/EditSubmission.hs
index beda8aa..8c5277e 100644
--- a/Handler/EditSubmission.hs
+++ b/Handler/EditSubmission.hs
@@ -127,7 +127,7 @@ changeSubmissionVisibility status submissionId =
   if isOwner
     then
      do
-      runDB $ update submissionId [SubmissionIsHidden =. Just (not status)]
+      runDB $ update submissionId [SubmissionIsHidden =. (not status)]
       setMessage $ toHtml (("Submission " :: Text) ++ (verb status))
     else
       setMessage $ toHtml ("Only owner can edit a submission!!!" :: Text)
diff --git a/Handler/ShowChallenge.hs b/Handler/ShowChallenge.hs
index 78a38a5..dca6a10 100644
--- a/Handler/ShowChallenge.hs
+++ b/Handler/ShowChallenge.hs
@@ -253,7 +253,7 @@ doCreateSubmission userId challengeId mDescription mTags repoSpec chan = do
 
       bestResultSoFar <- runDB $ E.select $ E.from $ \(evaluation, submission, variant, out) -> do
               E.where_ (submission ^. SubmissionChallenge E.==. E.val challengeId
-                        E.&&. submission ^. SubmissionIsHidden E.!=. E.val (Just True)
+                        E.&&. submission ^. SubmissionIsHidden E.==. E.val False
                         E.&&. variant ^. VariantSubmission E.==. submission ^. SubmissionId
                         E.&&. evaluation ^. EvaluationChecksum E.==. out ^. OutChecksum
                         E.&&. (E.not_ (E.isNothing (evaluation ^. EvaluationScore)))
@@ -383,7 +383,7 @@ getSubmission userId repoId commit challengeId description chan = do
         submissionStamp=time,
         submissionSubmitter=userId,
         submissionIsPublic=False,
-        submissionIsHidden=Just False }
+        submissionIsHidden=False }
 
 getOuts :: Channel -> Key Submission -> M.Map Text Text -> Handler ([Out])
 getOuts chan submissionId generalParams = do
diff --git a/Handler/Tables.hs b/Handler/Tables.hs
index 1386cfa..fc4ed59 100644
--- a/Handler/Tables.hs
+++ b/Handler/Tables.hs
@@ -254,7 +254,7 @@ getChallengeSubmissionInfos condition challengeId = do
 
   allSubmissionsVariants <- E.select $ E.from $ \(submission, variant) -> do
      E.where_ (submission ^. SubmissionChallenge E.==. E.val challengeId
-               E.&&. submission ^. SubmissionIsHidden E.!=. E.val (Just True)
+               E.&&. submission ^. SubmissionIsHidden E.==. E.val False
                E.&&. variant ^. VariantSubmission E.==. submission ^. SubmissionId)
      return (submission, variant)
 
diff --git a/config/models b/config/models
index 38239cc..43e5787 100644
--- a/config/models
+++ b/config/models
@@ -57,7 +57,7 @@ Submission
     stamp UTCTime default=now()
     submitter UserId
     isPublic Bool default=False
-    isHidden Bool Maybe
+    isHidden Bool default=False
     UniqueSubmissionRepoCommitChallenge repo commit challenge
 Variant
     submission SubmissionId
diff --git a/templates/edit-submission.hamlet b/templates/edit-submission.hamlet
index fe0e589..87cf5b9 100644
--- a/templates/edit-submission.hamlet
+++ b/templates/edit-submission.hamlet
@@ -25,7 +25,7 @@ $maybe variantId <- mVariantId
       _{MsgSubmit} <span class="glyphicon glyphicon-upload"></span>
   <hr>
 
-$if submissionIsHidden submission == Just True
+$if submissionIsHidden submission == True
   <p>Submission is hidden!
   <p>
     <a href=@{RestoreSubmissionR submissionId}>_{MsgRestoreSubmission}