diff --git a/backend/service/addRoute.go b/backend/service/addRoute.go index 82c33de..f5c2baf 100644 --- a/backend/service/addRoute.go +++ b/backend/service/addRoute.go @@ -1,6 +1,7 @@ package service import ( + "htwkalender/service/db" "htwkalender/service/events" v1 "htwkalender/service/fetch/v1" v2 "htwkalender/service/fetch/v2" @@ -170,6 +171,29 @@ func AddRoutes(app *pocketbase.PocketBase) { return nil }) + app.OnBeforeServe().Add(func(e *core.ServeEvent) error { + _, err := e.Router.AddRoute(echo.Route{ + Method: http.MethodDelete, + Path: "/api/feed", + Handler: func(c echo.Context) error { + token := c.QueryParam("token") + err := db.DeleteFeed(app.Dao(), token) + if err != nil { + return c.JSON(http.StatusInternalServerError, err) + } else { + return c.JSON(http.StatusOK, "Feed deleted") + } + }, + Middlewares: []echo.MiddlewareFunc{ + apis.ActivityLogger(app), + }, + }) + if err != nil { + return err + } + return nil + }) + app.OnBeforeServe().Add(func(e *core.ServeEvent) error { _, err := e.Router.AddRoute(echo.Route{ Method: http.MethodGet, diff --git a/backend/service/db/dbFeeds.go b/backend/service/db/dbFeeds.go index 408d763..07e4a1f 100644 --- a/backend/service/db/dbFeeds.go +++ b/backend/service/db/dbFeeds.go @@ -1,6 +1,8 @@ package db import ( + "errors" + "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/models" @@ -39,6 +41,25 @@ func FindFeedByToken(token string, app *pocketbase.PocketBase) (*model.Feed, err return &feed, err } +func DeleteFeed(db *daos.Dao, feedId string) error { + + sqlResult, err := db.DB().Delete("feeds", dbx.NewExp("id = {:id}", dbx.Params{"id": feedId})).Execute() + var deletedRows int64 + if sqlResult != nil { + deletedRows, _ = sqlResult.RowsAffected() + } + + if err != nil { + return err + } else { + if deletedRows == 0 { + return errors.New("No feed with id " + feedId + " found") + } else { + return nil + } + } +} + func GetAllFeeds(db *daos.Dao) ([]model.Feed, error) { var feeds []model.Feed err := db.DB().Select("*").From("feeds").All(&feeds) diff --git a/backend/service/db/dbFeeds_test.go b/backend/service/db/dbFeeds_test.go new file mode 100644 index 0000000..33ea2fd --- /dev/null +++ b/backend/service/db/dbFeeds_test.go @@ -0,0 +1,55 @@ +package db + +import ( + "github.com/pocketbase/pocketbase/daos" + "github.com/pocketbase/pocketbase/tests" + "testing" +) + +const testDataDir = "./mockData" + +func TestDeleteFeed(t *testing.T) { + + setupTestApp := func(t *testing.T) *daos.Dao { + testApp, err := tests.NewTestApp(testDataDir) + if err != nil { + t.Fatal(err) + } + dao := daos.New(testApp.Dao().DB()) + return dao + } + + type args struct { + db *daos.Dao + feedId string + } + testsCases := []struct { + name string + args args + wantErr bool + }{ + { + name: "TestDeleteFeed", + args: args{ + db: setupTestApp(t), + feedId: "fkoqti06ohlnsb8", + }, + wantErr: false, + }, + { + name: "TestDeleteFeedNotExisting", + args: args{ + db: setupTestApp(t), + feedId: "test324", + }, + wantErr: true, + }, + } + for _, tt := range testsCases { + t.Run(tt.name, func(t *testing.T) { + if err := DeleteFeed(tt.args.db, tt.args.feedId); (err != nil) != tt.wantErr { + t.Errorf("DeleteFeed() error = %v, wantErr %v", err, tt.wantErr) + } + }) + } +} diff --git a/backend/service/db/mockData/data.db b/backend/service/db/mockData/data.db new file mode 100644 index 0000000..acca65d Binary files /dev/null and b/backend/service/db/mockData/data.db differ diff --git a/backend/service/db/mockData/logs.db b/backend/service/db/mockData/logs.db new file mode 100644 index 0000000..1391d96 Binary files /dev/null and b/backend/service/db/mockData/logs.db differ