@@ -118,13 +118,13 @@ instance FromJSONObject User where
118118 parseJSONObject = \ obj ->
119119 User
120120 -- potentially return "error exists" + user object
121- <$> obj .: " user_firebase_uid "
122- <*> obj .: " user_anonymous " -- TODO: TTL
121+ <$> obj .: " firebase_uid "
122+ <*> obj .: " anonymous " -- TODO: TTL
123123
124124instance ToJSONObject User where
125125 toJSONObject user = HMS. fromList
126- [ " user_firebase_uid " .= userFirebaseId user
127- , " user_anonymous " .= userAnonymous user
126+ [ " firebase_uid " .= userFirebaseId user
127+ , " anonymous " .= userAnonymous user
128128 ]
129129
130130instance Aeson. FromJSON User where
@@ -164,15 +164,15 @@ data Deck = Deck
164164instance FromJSONObject Deck where
165165 parseJSONObject = \ obj ->
166166 Deck
167- <$> obj .: " deck_slides "
168- <*> obj .: " deck_name "
169- <*> obj .: " deck_owner_id "
167+ <$> obj .: " slides "
168+ <*> obj .: " name "
169+ <*> obj .: " owner_id "
170170
171171instance ToJSONObject Deck where
172172 toJSONObject deck = HMS. fromList
173- [ " deck_slides " .= deckSlides deck
174- , " deck_name " .= deckDeckname deck
175- , " deck_owner_id " .= deckOwnerId deck
173+ [ " slides " .= deckSlides deck
174+ , " name " .= deckDeckname deck
175+ , " owner_id " .= deckOwnerId deck
176176 ]
177177
178178instance Aeson. FromJSON Deck where
@@ -221,15 +221,15 @@ data Slide = Slide
221221instance FromJSONObject Slide where
222222 parseJSONObject = \ obj ->
223223 Slide <$>
224- obj .: " slide_content " <*>
225- obj .: " slide_template " <*>
226- obj .:? " slide_attributes " .!= HMS. empty
224+ obj .: " content " <*>
225+ obj .: " template " <*>
226+ obj .:? " attributes " .!= HMS. empty
227227
228228instance ToJSONObject Slide where
229229 toJSONObject slide = HMS. fromList
230- [ " slide_template " .= slideTemplate slide
231- , " slide_attributes " .= slideAttributes slide
232- , " slide_content " .= slideContent slide
230+ [ " template " .= slideTemplate slide
231+ , " attributes " .= slideAttributes slide
232+ , " content " .= slideContent slide
233233 ]
234234
235235instance Aeson. FromJSON Slide where
@@ -565,7 +565,7 @@ userToItem :: UserId -> User -> HMS.HashMap T.Text DynamoDB.AttributeValue
565565userToItem userId User {userFirebaseId, userAnonymous} =
566566 HMS. singleton " UserId" (userIdToAttributeValue userId) <>
567567 HMS. singleton " UserFirebaseId" (userFirebaseIdToAttributeValue userFirebaseId) <>
568- HMS. singleton " UserAnonymous" (userAnonymousToAttributeValue userAnonymous) -- <>B
568+ HMS. singleton " UserAnonymous" (userAnonymousToAttributeValue userAnonymous)
569569
570570userToItem' :: User -> HMS. HashMap T. Text DynamoDB. AttributeValue
571571userToItem' User {userFirebaseId, userAnonymous} =
0 commit comments