Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit 3c2f26b

Browse files
committed
handler: feat: remove GET slides
1 parent 3eeaec0 commit 3c2f26b

File tree

2 files changed

+0
-49
lines changed

2 files changed

+0
-49
lines changed

infra/handler/app/Test.hs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,12 @@ main = do
6565
Right deck ->
6666
if deck == (Item deckId newDeck) then pure () else (error $ "Expected get deck, got: " <> show deck)
6767

68-
runClientM (slidesGet' b deckId) clientEnv >>= \case
69-
Left err -> error $ "Expected slides, got error: " <> show err
70-
Right slides ->
71-
if slides == [Item slideId someSlide] then pure () else (error $ "Expected slides, got: " <> show slides)
72-
7368
let updatedSlide = Slide "foo" "quux" HMS.empty
7469

7570
runClientM (slidesPut' b deckId slideId updatedSlide) clientEnv >>= \case
7671
Left err -> error $ "Expected new slide, got error: " <> show err
7772
Right {} -> pure ()
7873

79-
runClientM (slidesGet' b deckId) clientEnv >>= \case
80-
Left err -> error $ "Expected updated slides, got error: " <> show err
81-
Right slides ->
82-
if slides == [Item slideId updatedSlide] then pure () else (error $ "Expected updated slides, got: " <> show slides)
83-
8474
runClientM (slidesGetSlideId' b deckId slideId) clientEnv >>= \case
8575
Left err -> error $ "Expected updated slide, got error: " <> show err
8676
Right slide ->
@@ -90,11 +80,6 @@ main = do
9080
Left err -> error $ "Expected slide delete, got error: " <> show err
9181
Right {} -> pure ()
9282

93-
runClientM (slidesGet' b deckId) clientEnv >>= \case
94-
Left err -> error $ "Expected no slides, got error: " <> show err
95-
Right slides ->
96-
if slides == [] then pure () else (error $ "Expected no slides, got: " <> show slides)
97-
9883
runClientM (decksDelete' b deckId) clientEnv >>= \case
9984
Left err -> error $ "Expected deck delete, got error: " <> show err
10085
Right {} -> pure ()
@@ -138,7 +123,6 @@ decksPost' :: T.Text -> Deck -> ClientM (Item DeckId Deck)
138123
decksPut' :: T.Text -> DeckId -> Deck -> ClientM (Item DeckId Deck)
139124
decksDelete' :: T.Text -> DeckId -> ClientM ()
140125

141-
slidesGet' :: T.Text -> DeckId -> ClientM [Item SlideId Slide]
142126
slidesGetSlideId' :: T.Text -> DeckId -> SlideId -> ClientM (Item SlideId Slide)
143127
slidesPost' :: T.Text -> DeckId -> Slide -> ClientM (Item SlideId Slide)
144128
slidesPut' :: T.Text -> DeckId -> SlideId -> Slide -> ClientM (Item SlideId Slide)
@@ -158,7 +142,6 @@ slidesDelete' :: T.Text -> DeckId -> SlideId -> ClientM ()
158142
decksDelete'
159143
) :<|>
160144
(
161-
slidesGet' :<|>
162145
slidesGetSlideId' :<|>
163146
slidesPost' :<|>
164147
slidesPut' :<|>

infra/handler/src/DeckGo/Handler.hs

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ type DecksAPI =
164164
Capture "deck_id" DeckId :>
165165
ReqBody '[JSON] Deck :> Put '[JSON] (Item DeckId Deck) :<|>
166166
Protected :> Capture "deck_id" DeckId :> Delete '[JSON] ()
167-
-- Capture "deck_id" DeckId :> "slides" :> SlidesAPI
168167

169168
newtype DeckId = DeckId { unDeckId :: T.Text }
170169
deriving newtype (Aeson.FromJSON, Aeson.ToJSON, FromHttpApiData, ToHttpApiData, Show, Eq)
@@ -234,9 +233,6 @@ instance ToParamSchema DeckId where
234233
-- SLIDES
235234

236235
type SlidesAPI =
237-
238-
-- Protected :> Capture "deck_id" DeckId :> Delete '[JSON] ()
239-
Protected :> Capture "deck_id" DeckId :> "slides" :> Get '[JSON] [Item SlideId Slide] :<|>
240236
Protected :> Capture "deck_id" DeckId :> "slides" :>
241237
Capture "slide_id" SlideId :> Get '[JSON] (Item SlideId Slide) :<|>
242238
Protected :> Capture "deck_id" DeckId :> "slides" :>
@@ -331,7 +327,6 @@ server env = serveUsers :<|> serveDecks :<|> serveSlides
331327
decksPut env :<|>
332328
decksDelete env
333329
serveSlides =
334-
slidesGet env :<|>
335330
slidesGetSlideId env :<|>
336331
slidesPost env :<|>
337332
slidesPut env :<|>
@@ -633,33 +628,6 @@ getDeck env deckId = do
633628

634629
-- SLIDES
635630

636-
slidesGet :: Aws.Env -> Firebase.UserId -> DeckId -> Servant.Handler [Item SlideId Slide]
637-
slidesGet env fuid deckId = do
638-
639-
getDeck env deckId >>= \case
640-
Nothing -> do
641-
liftIO $ putStrLn $ unwords
642-
[ "Trying to GET slides for", show deckId, "but deck doesn't exist." ]
643-
Servant.throwError Servant.err404
644-
Just deck@Deck{deckOwnerId, deckSlides} -> do
645-
when (Firebase.unUserId fuid /= unFirebaseId (unUserId deckOwnerId)) $ do
646-
liftIO $ putStrLn $ unwords $
647-
[ "Slides were requested for ", show deck, "but requester is not the owner", show fuid ]
648-
Servant.throwError Servant.err404
649-
650-
res <- runAWS env $ Aws.send $ DynamoDB.scan "Slides"
651-
case res of
652-
Right scanResponse ->
653-
case sequence $ scanResponse ^. DynamoDB.srsItems <&> itemToSlide of
654-
Nothing -> do
655-
liftIO $ putStrLn $ "Could not parse respose: " <> show scanResponse
656-
Servant.throwError Servant.err500
657-
Just ids -> pure ids
658-
659-
Left e -> do
660-
liftIO $ print e
661-
Servant.throwError Servant.err500
662-
663631
slidesGetSlideId :: Aws.Env -> Firebase.UserId -> DeckId -> SlideId -> Servant.Handler (Item SlideId Slide)
664632
slidesGetSlideId env _ _ slideId = do
665633
res <- runAWS env $ Aws.send $ DynamoDB.getItem "Slides" &

0 commit comments

Comments
 (0)