fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(exam-office): exam-office permissions by courseSchool

Browse Source
This commit is contained in:
Gregor Kleen 2019-09-16 10:12:17 +02:00
parent 174c8c2bff
commit 5841a7b5d2
7 changed files with 56 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Foundation.hs
View File

@ -66,7 +66,7 @@ import qualified Control.Monad.Catch as C
import Handler.Utils.StudyFeatures import Handler.Utils.StudyFeatures
import Handler.Utils.SchoolLdap import Handler.Utils.SchoolLdap
import Handler.Utils.ExamOffice.Exam.Auth import Handler.Utils.ExamOffice.Exam
import Handler.Utils.ExamOffice.Course import Handler.Utils.ExamOffice.Course
import Handler.Utils.Profile import Handler.Utils.Profile
import Utils.Form import Utils.Form

3
src/Handler/ExamOffice/Exam.hs
View File

@ -7,7 +7,6 @@ import Handler.Utils
import Handler.Utils.Exam import Handler.Utils.Exam
import Handler.Utils.Csv import Handler.Utils.Csv
import qualified Handler.Utils.ExamOffice.Exam as Exam import qualified Handler.Utils.ExamOffice.Exam as Exam
import Handler.Utils.ExamOffice.Exam.Auth
import qualified Database.Esqueleto as E import qualified Database.Esqueleto as E
import qualified Database.Esqueleto.Utils as E import qualified Database.Esqueleto.Utils as E
@ -228,7 +227,7 @@ postEGradesR tid ssh csh examn = do
E.where_ $ examResult E.^. ExamResultExam E.==. E.val eid E.where_ $ examResult E.^. ExamResultExam E.==. E.val eid
unless isLecturer $ unless isLecturer $
E.where_ $ examOfficeExamResultAuth (E.val uid) examResult E.where_ $ Exam.examOfficeExamResultAuth (E.val uid) examResult
return (examResult, user, occurrence, studyFeatures, studyDegree, studyField, examRegistration, isSynced) return (examResult, user, occurrence, studyFeatures, studyDegree, studyField, examRegistration, isSynced)
dbtRowKey = views queryExamResult (E.^. ExamResultId) dbtRowKey = views queryExamResult (E.^. ExamResultId)

7
src/Handler/ExamOffice/Exams.hs
View File

@ -5,7 +5,6 @@ module Handler.ExamOffice.Exams
import Import import Import
import Handler.Utils import Handler.Utils
import Handler.Utils.ExamOffice.Exam.Auth
import qualified Handler.Utils.ExamOffice.Exam as Exam import qualified Handler.Utils.ExamOffice.Exam as Exam
import qualified Database.Esqueleto as E import qualified Database.Esqueleto as E
@ -34,7 +33,7 @@ querySynchronised office = to . runReader $ do
let let
synchronised = E.sub_select . E.from $ \examResult -> do synchronised = E.sub_select . E.from $ \examResult -> do
E.where_ $ examResult E.^. ExamResultExam E.==. exam E.^. ExamId E.where_ $ examResult E.^. ExamResultExam E.==. exam E.^. ExamId
E.where_ $ examOfficeExamResultAuth office examResult E.where_ $ Exam.examOfficeExamResultAuth office examResult
E.where_ $ Exam.resultIsSynced office examResult E.where_ $ Exam.resultIsSynced office examResult
return E.countRows return E.countRows
return synchronised return synchronised
@ -45,7 +44,7 @@ queryResults office = to . runReader $ do
let let
results = E.sub_select . E.from $ \examResult -> do results = E.sub_select . E.from $ \examResult -> do
E.where_ $ examResult E.^. ExamResultExam E.==. exam E.^. ExamId E.where_ $ examResult E.^. ExamResultExam E.==. exam E.^. ExamId
E.where_ $ examOfficeExamResultAuth office examResult E.where_ $ Exam.examOfficeExamResultAuth office examResult
return E.countRows return E.countRows
return results return results
@ -55,7 +54,7 @@ queryIsSynced office = to . runReader $ do
let let
synchronised = E.not_ . E.exists . E.from $ \examResult -> do synchronised = E.not_ . E.exists . E.from $ \examResult -> do
E.where_ $ examResult E.^. ExamResultExam E.==. exam E.^. ExamId E.where_ $ examResult E.^. ExamResultExam E.==. exam E.^. ExamId
E.where_ $ examOfficeExamResultAuth office examResult E.where_ $ Exam.examOfficeExamResultAuth office examResult
E.where_ . E.not_ $ Exam.resultIsSynced office examResult E.where_ . E.not_ $ Exam.resultIsSynced office examResult
return synchronised return synchronised

16
src/Handler/Utils/ExamOffice/Course.hs
View File

@ -11,8 +11,8 @@ import qualified Database.Esqueleto.Utils as E
courseExamOfficeSchools :: E.SqlExpr (E.Value UserId) courseExamOfficeSchools :: E.SqlExpr (E.Value UserId)
-> E.SqlExpr (E.Value CourseId) -> E.SqlExpr (E.Value CourseId)
-> E.SqlQuery (E.SqlExpr (Entity School), E.SqlExpr (E.Value Bool)) -- ^ @Entity School@ and @forced@ -> E.SqlQuery (E.SqlExpr (Entity School), E.SqlExpr (E.Value Bool)) -- ^ @Entity School@ and @forced@
courseExamOfficeSchools user _course = E.from $ \(school `E.InnerJoin` userFunction `E.InnerJoin` (examOfficeField `E.FullOuterJoin` examOfficeUser)) courseExamOfficeSchools user course = E.from $ \((school `E.InnerJoin` userFunction) `E.LeftOuterJoin` (examOfficeField `E.FullOuterJoin` examOfficeUser))
-> E.distinctOnOrderBy [E.asc $ userFunction E.^. UserFunctionSchool] $ do -> E.distinctOnOrderBy [E.asc $ school E.^. SchoolId] $ do
E.on E.false E.on E.false
E.on $ ( examOfficeUser E.?. ExamOfficeUserUser E.==. E.just user E.on $ ( examOfficeUser E.?. ExamOfficeUserUser E.==. E.just user
E.&&. examOfficeUser E.?. ExamOfficeUserOffice E.==. E.just (userFunction E.^. UserFunctionUser) E.&&. examOfficeUser E.?. ExamOfficeUserOffice E.==. E.just (userFunction E.^. UserFunctionUser)
@ -26,7 +26,17 @@ courseExamOfficeSchools user _course = E.from $ \(school `E.InnerJoin` userFunct
E.on $ school E.^. SchoolId E.==. userFunction E.^. UserFunctionSchool E.on $ school E.^. SchoolId E.==. userFunction E.^. UserFunctionSchool
E.&&. userFunction E.^. UserFunctionFunction E.==. E.val SchoolExamOffice E.&&. userFunction E.^. UserFunctionFunction E.==. E.val SchoolExamOffice
let forced = E.maybe E.true id $ examOfficeField E.?. ExamOfficeFieldForced let byUser = E.not_ . E.isNothing $ examOfficeUser E.?. ExamOfficeUserId
byField = E.not_ . E.isNothing $ examOfficeField E.?. ExamOfficeFieldId
byCourse = E.exists . E.from $ \course' ->
E.where_ $ course' E.^. CourseId E.==. course
E.&&. course' E.^. CourseSchool E.==. school E.^. SchoolId
forced = byUser
E.||. byCourse
E.||. E.maybe E.true id (examOfficeField E.?. ExamOfficeFieldForced)
E.where_ $ byUser E.||. byField E.||. byCourse
E.orderBy [E.desc forced] E.orderBy [E.desc forced]
return (school, forced) return (school, forced)

38
src/Handler/Utils/ExamOffice/Exam.hs
View File

@ -1,5 +1,6 @@
module Handler.Utils.ExamOffice.Exam module Handler.Utils.ExamOffice.Exam
( resultIsSynced ( resultIsSynced
, examOfficeExamResultAuth
) where ) where
import Import.NoFoundation import Import.NoFoundation
@ -9,7 +10,7 @@ import qualified Database.Esqueleto as E
resultIsSynced :: E.SqlExpr (E.Value UserId) -- ^ office resultIsSynced :: E.SqlExpr (E.Value UserId) -- ^ office
-> E.SqlExpr (Entity ExamResult) -> E.SqlExpr (Entity ExamResult)
-> E.SqlExpr (E.Value Bool) -> E.SqlExpr (E.Value Bool)
resultIsSynced authId examResult = (hasSchool E.&&. allSchools) E.||. anySync resultIsSynced authId examResult = (hasSchool E.&&. allSchools) E.||. (E.not_ hasSchool E.&&. anySync)
where where
anySync = E.exists . E.from $ \synced -> anySync = E.exists . E.from $ \synced ->
E.where_ $ synced E.^. ExamOfficeResultSyncedResult E.==. examResult E.^. ExamResultId E.where_ $ synced E.^. ExamOfficeResultSyncedResult E.==. examResult E.^. ExamResultId
@ -25,3 +26,38 @@ resultIsSynced authId examResult = (hasSchool E.&&. allSchools) E.||. anySync
E.where_ $ synced E.^. ExamOfficeResultSyncedSchool E.==. E.just (userFunction E.^. UserFunctionSchool) E.where_ $ synced E.^. ExamOfficeResultSyncedSchool E.==. E.just (userFunction E.^. UserFunctionSchool)
E.&&. synced E.^. ExamOfficeResultSyncedResult E.==. examResult E.^. ExamResultId E.&&. synced E.^. ExamOfficeResultSyncedResult E.==. examResult E.^. ExamResultId
E.&&. synced E.^. ExamOfficeResultSyncedTime E.>=. examResult E.^. ExamResultLastChanged E.&&. synced E.^. ExamOfficeResultSyncedTime E.>=. examResult E.^. ExamResultLastChanged
examOfficeExamResultAuth :: E.SqlExpr (E.Value UserId) -- ^ office
-> E.SqlExpr (Entity ExamResult)
-> E.SqlExpr (E.Value Bool)
examOfficeExamResultAuth authId examResult = authByUser E.||. authByField E.||. authBySchool
where
authByField = E.exists . E.from $ \(examOfficeField `E.InnerJoin` studyFeatures) -> do
E.on $ studyFeatures E.^. StudyFeaturesField E.==. examOfficeField E.^. ExamOfficeFieldField
E.where_ $ studyFeatures E.^. StudyFeaturesUser E.==. examResult E.^. ExamResultUser
E.&&. examOfficeField E.^. ExamOfficeFieldOffice E.==. authId
E.&&. examOfficeField E.^. ExamOfficeFieldField E.==. studyFeatures E.^. StudyFeaturesField
E.where_ $ examOfficeField E.^. ExamOfficeFieldForced
E.||. E.exists (E.from $ \userFunction ->
E.where_ $ userFunction E.^. UserFunctionUser E.==. authId
E.&&. userFunction E.^. UserFunctionFunction E.==. E.val SchoolExamOffice
E.&&. E.not_ (E.exists . E.from $ \(course `E.InnerJoin` exam `E.InnerJoin` courseUserExamOfficeOptOut) -> do
E.on $ courseUserExamOfficeOptOut E.^. CourseUserExamOfficeOptOutCourse E.==. course E.^. CourseId
E.on $ exam E.^. ExamCourse E.==. course E.^. CourseId
E.where_ $ exam E.^. ExamId E.==. examResult E.^. ExamResultExam
E.where_ $ courseUserExamOfficeOptOut E.^. CourseUserExamOfficeOptOutUser E.==. examResult E.^. ExamResultUser
E.&&. courseUserExamOfficeOptOut E.^. CourseUserExamOfficeOptOutSchool E.==. userFunction E.^. UserFunctionSchool
)
)
authByUser = E.exists . E.from $ \examOfficeUser ->
E.where_ $ examOfficeUser E.^. ExamOfficeUserOffice E.==. authId
E.&&. examOfficeUser E.^. ExamOfficeUserUser E.==. examResult E.^. ExamResultUser
authBySchool = E.exists . E.from $ \(userFunction `E.InnerJoin` course `E.InnerJoin` exam) -> do
E.on $ course E.^. CourseId E.==. exam E.^. ExamCourse
E.&&. exam E.^. ExamId E.==. examResult E.^. ExamResultExam
E.on $ course E.^. CourseSchool E.==. userFunction E.^. UserFunctionSchool
E.&&. userFunction E.^. UserFunctionFunction E.==. E.val SchoolExamOffice
E.where_ $ userFunction E.^. UserFunctionUser E.==. authId

34
src/Handler/Utils/ExamOffice/Exam/Auth.hs
View File

@ -1,34 +0,0 @@
module Handler.Utils.ExamOffice.Exam.Auth
( examOfficeExamResultAuth
) where
import Import.NoFoundation
import qualified Database.Esqueleto as E
examOfficeExamResultAuth :: E.SqlExpr (E.Value UserId) -- ^ office
-> E.SqlExpr (Entity ExamResult)
-> E.SqlExpr (E.Value Bool)
examOfficeExamResultAuth authId examResult = authByUser E.||. authByField
where
authByField = E.exists . E.from $ \(examOfficeField `E.InnerJoin` studyFeatures) -> do
E.on $ studyFeatures E.^. StudyFeaturesField E.==. examOfficeField E.^. ExamOfficeFieldField
E.where_ $ studyFeatures E.^. StudyFeaturesUser E.==. examResult E.^. ExamResultUser
E.&&. examOfficeField E.^. ExamOfficeFieldOffice E.==. authId
E.&&. examOfficeField E.^. ExamOfficeFieldField E.==. studyFeatures E.^. StudyFeaturesField
E.where_ $ examOfficeField E.^. ExamOfficeFieldForced
E.||. E.exists (E.from $ \userFunction ->
E.where_ $ userFunction E.^. UserFunctionUser E.==. authId
E.&&. userFunction E.^. UserFunctionFunction E.==. E.val SchoolExamOffice
E.&&. E.not_ (E.exists . E.from $ \(course `E.InnerJoin` exam `E.InnerJoin` courseUserExamOfficeOptOut) -> do
E.on $ courseUserExamOfficeOptOut E.^. CourseUserExamOfficeOptOutCourse E.==. course E.^. CourseId
E.on $ exam E.^. ExamCourse E.==. course E.^. CourseId
E.where_ $ exam E.^. ExamId E.==. examResult E.^. ExamResultExam
E.where_ $ courseUserExamOfficeOptOut E.^. CourseUserExamOfficeOptOutUser E.==. examResult E.^. ExamResultUser
E.&&. courseUserExamOfficeOptOut E.^. CourseUserExamOfficeOptOutSchool E.==. userFunction E.^. UserFunctionSchool
)
)
authByUser = E.exists . E.from $ \examOfficeUser ->
E.where_ $ examOfficeUser E.^. ExamOfficeUserOffice E.==. authId
E.&&. examOfficeUser E.^. ExamOfficeUserUser E.==. examResult E.^. ExamResultUser

2
src/Jobs/Handler/QueueNotification.hs
View File

@ -15,7 +15,7 @@ import Jobs.Queue
import qualified Data.Set as Set import qualified Data.Set as Set
import Handler.Utils.ExamOffice.Exam.Auth import Handler.Utils.ExamOffice.Exam
dispatchJobQueueNotification :: Notification -> Handler () dispatchJobQueueNotification :: Notification -> Handler ()