From 14c2f6d82d8e6d7d472cfb200d8d491fc0e964fa Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 8 Feb 2022 22:17:20 +0100 Subject: [PATCH] chore(model): eppn as Text, move to User Types --- src/Model/Types/Common.hs | 15 +++++++-------- src/Model/Types/User.hs | 3 +++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Model/Types/Common.hs b/src/Model/Types/Common.hs index 91fb5996e..17eb6bc3d 100644 --- a/src/Model/Types/Common.hs +++ b/src/Model/Types/Common.hs @@ -18,14 +18,13 @@ type Points = Centi type Email = Text -type UserTitle = Text -type UserFirstName = Text -type UserSurname = Text -type UserDisplayName = Text -type UserIdent = CI Text -type UserMatriculation = Text -type UserEmail = CI Email -type UserEduPersonPrincipalName = CI Email +type UserTitle = Text +type UserFirstName = Text +type UserSurname = Text +type UserDisplayName = Text +type UserIdent = CI Text +type UserMatriculation = Text +type UserEmail = CI Email type StudyDegreeName = Text type StudyDegreeShorthand = Text diff --git a/src/Model/Types/User.hs b/src/Model/Types/User.hs index 6e1b966a4..4f99c37de 100644 --- a/src/Model/Types/User.hs +++ b/src/Model/Types/User.hs @@ -4,6 +4,9 @@ import Import.NoModel import Model.Types.TH.PathPiece +type UserEduPersonPrincipalName = CI Text + + data SystemFunction = SystemExamOffice | SystemFaculty