Distinguish b/w Account and User

Additionally: supporting more CRUDL methods for the Accounts and Trips tables.

1 files changed, 19 insertions, 0 deletions

diff --git a/src/Types.hs b/src/Types.hs
index 6d6b83347931..2f78ddb9a112 100644
--- a/src/Types.hs
+++ b/src/Types.hs
@@ -234,3 +234,22 @@ tripFields (Trip{ tripUsername
 
 instance ToJSON Trip
 instance FromJSON Trip
+
+-- | Users and Accounts both refer to the same underlying entities; however,
+-- Users model the user-facing Account details, hiding sensitive details like
+-- passwords and emails.
+data User = User
+  { userUsername :: Username
+  , userProfilePicture :: ProfilePicture
+  , userRole :: Role
+  } deriving (Eq, Show, Generic)
+
+instance ToJSON User
+instance FromJSON User
+
+userFromAccount :: Account -> User
+userFromAccount account =
+  User { userUsername = accountUsername account
+       , userProfilePicture = accountProfilePicture account
+       , userRole = accountRole account
+       }