Merge pull request #72 from BenMusch/benMuschol-deleteDeck

Add DeleteDeck API

Author: domino14

api/rpc/wordvault/api.pb.go

@@ -24,9 +24,14 @@ SET name = $2
 WHERE id = $1 AND user_id = $3
 RETURNING *;
 
+-- name: CountCardsInDeck :one
+SELECT COUNT(*)
+FROM wordvault_cards
+WHERE COALESCE(deck_id, 0) = sqlc.arg(deck_id)::bigint AND user_id = sqlc.arg(user_id)::bigint;
+
 -- name: DeleteDeck :exec
 DELETE FROM wordvault_decks
-WHERE id = $1;
+WHERE id = $1 AND user_id = $2;
 
 -- name: GetNextScheduled :many
 SELECT alphagram, next_scheduled, fsrs_card, COALESCE(deck_id, 0) as deck_id

api/rpc/wordvault/wordvaultconnect/api.connect.go

@@ -1344,6 +1344,41 @@ func (s *Server) EditDeck(ctx context.Context, req *connect.Request[pb.EditDeckR
 	}), nil
 }
 
+func (s *Server) DeleteDeck(ctx context.Context, req *connect.Request[pb.DeleteDeckRequest]) (
+	*connect.Response[pb.DeleteDeckResponse], error) {
+
+	user := auth.UserFromContext(ctx)
+	if user == nil {
+		return nil, unauthenticated("user not authenticated")
+	}
+
+	if req.Msg.Id == 0 {
+		return nil, invalidArgError("need a deck")
+	}
+
+	cardCount, err := s.Queries.CountCardsInDeck(ctx, models.CountCardsInDeckParams{
+		DeckID: req.Msg.Id,
+		UserID: int64(user.DBID),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	if cardCount > 0 {
+		return nil, invalidArgError("cannot delete deck with cards in it")
+	}
+
+	err = s.Queries.DeleteDeck(ctx, models.DeleteDeckParams{
+		ID:     req.Msg.Id,
+		UserID: int64(user.DBID),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return connect.NewResponse(&pb.DeleteDeckResponse{}), nil
+}
+
 // The fsrs library fuzzes only by day. It tends to ask questions at the same
 // hour and minute that they were asked last. We want to add a little bit of a fuzz
 // to allow for more randomness.

db/queries/cards.sql

@@ -2021,3 +2021,78 @@ func TestMoveCardsWithDecks(t *testing.T) {
 	}))
 	is.True(err != nil) // Should be error
 }
+
+func TestDeleteDeck(t *testing.T) {
+	is := is.New(t)
+
+	err := RecreateTestDB()
+	if err != nil {
+		panic(err)
+	}
+	ctx := ctxForTests()
+
+	dbPool, err := pgxpool.New(ctx, testDBURI(true))
+	is.NoErr(err)
+	defer dbPool.Close()
+
+	q := models.New(dbPool)
+
+	s := NewServer(DefaultConfig, dbPool, q, &searchserver.Server{Config: DefaultConfig})
+
+	deck1, err := s.AddDeck(ctx, connect.NewRequest(&pb.AddDeckRequest{
+		Name:    "Empty Deck",
+		Lexicon: "NWL23",
+	}))
+	is.NoErr(err)
+	deck1ID := deck1.Msg.Deck.Id
+
+	deck2, err := s.AddDeck(ctx, connect.NewRequest(&pb.AddDeckRequest{
+		Name:    "Deck With Cards",
+		Lexicon: "NWL23",
+	}))
+	is.NoErr(err)
+	deck2ID := deck2.Msg.Deck.Id
+
+	_, err = s.AddCards(ctx, connect.NewRequest(&pb.AddCardsRequest{
+		Lexicon:    "NWL23",
+		Alphagrams: []string{"ADEEGMMO", "ADEEHMMO"},
+		DeckId:     uint64(deck2ID),
+	}))
+	is.NoErr(err)
+
+	_, err = s.DeleteDeck(ctx, connect.NewRequest(&pb.DeleteDeckRequest{
+		Id: 0,
+	}))
+	is.True(err.Error() == "invalid_argument: need a deck")
+
+	_, err = s.DeleteDeck(ctx, connect.NewRequest(&pb.DeleteDeckRequest{
+		Id: deck2ID,
+	}))
+	is.True(err.Error() == "invalid_argument: cannot delete deck with cards in it")
+
+	_, err = s.DeleteDeck(ctx, connect.NewRequest(&pb.DeleteDeckRequest{
+		Id: deck1ID,
+	}))
+	is.NoErr(err)
+
+	decks, err := s.GetDecks(ctx, connect.NewRequest(&pb.GetDecksRequest{}))
+	is.NoErr(err)
+	is.Equal(len(decks.Msg.Decks), 1)
+	is.Equal(decks.Msg.Decks[0].Id, deck2ID)
+
+	_, err = s.DeleteFromDeck(ctx, connect.NewRequest(&pb.DeleteFromDeckRequest{
+		Lexicon:      "NWL23",
+		AllQuestions: true,
+		DeckId:       uint64(deck2ID),
+	}))
+	is.NoErr(err)
+
+	_, err = s.DeleteDeck(ctx, connect.NewRequest(&pb.DeleteDeckRequest{
+		Id: deck2ID,
+	}))
+	is.NoErr(err)
+
+	decks, err = s.GetDecks(ctx, connect.NewRequest(&pb.GetDecksRequest{}))
+	is.NoErr(err)
+	is.Equal(len(decks.Msg.Decks), 0)
+}

internal/stores/models/cards.sql.go

@@ -246,6 +246,12 @@ message EditDeckResponse {
   Deck deck = 1;
 }
 
+message DeleteDeckRequest {
+  int64 id = 1;
+}
+
+message DeleteDeckResponse {}
+
 message EditFsrsParametersResponse {}
 
 service WordVaultService {
@@ -296,4 +302,5 @@ service WordVaultService {
   rpc AddDeck(AddDeckRequest) returns (AddDeckResponse);
   rpc GetDecks(GetDecksRequest) returns (GetDecksResponse);
   rpc EditDeck(EditDeckRequest) returns (EditDeckResponse);
+  rpc DeleteDeck(DeleteDeckRequest) returns (DeleteDeckResponse);
 }