1 files changed, 8 insertions, 23 deletions
diff --git a/src/server/Model/User.hs b/src/server/Model/User.hs
index c8a0d53..eb78a69 100644
--- a/src/server/Model/User.hs
+++ b/src/server/Model/User.hs
@@ -1,35 +1,23 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings    #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Model.User
-  ( UserId
-  , User(..)
-  , list
-  , getUser
-  , findUser
+  ( list
+  , get
   , createUser
   , deleteUser
   ) where
 
-import Data.Int (Int64)
-import Data.List (find)
 import Data.Maybe (listToMaybe)
 import Data.Text (Text)
 import Data.Time.Clock (getCurrentTime)
-import Data.Time.Clock (UTCTime)
 import Database.SQLite.Simple (Only(Only), FromRow(fromRow))
 import Prelude hiding (id)
 import qualified Database.SQLite.Simple as SQLite
 
-import Model.Query (Query(Query))
-
-type UserId = Int64
+import Common.Model (UserId, User(..))
 
-data User = User
-  { id :: UserId
-  , creation :: UTCTime
-  , email :: Text
-  , name :: Text
-  } deriving Show
+import Model.Query (Query(Query))
 
 instance FromRow User where
   fromRow = User <$> SQLite.field <*> SQLite.field <*> SQLite.field <*> SQLite.field
@@ -37,15 +25,12 @@ instance FromRow User where
 list :: Query [User]
 list = Query (\conn -> SQLite.query_ conn "SELECT * from user ORDER BY creation DESC")
 
-getUser :: Text -> Query (Maybe User)
-getUser userEmail =
+get :: Text -> Query (Maybe User)
+get userEmail =
   Query (\conn -> listToMaybe <$>
     SQLite.query conn "SELECT * FROM user WHERE email = ? LIMIT 1" (Only userEmail)
   )
 
-findUser :: UserId -> [User] -> Maybe User
-findUser userId = find ((==) userId . id)
-
 createUser :: Text -> Text -> Query UserId
 createUser userEmail userName =
   Query (\conn -> do