feat:#44 updated delete process and api response

services/data-manager/service/addCalDavRoutes.go

@@ -21,7 +21,7 @@ import (
 	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/apis"
 	"github.com/pocketbase/pocketbase/core"
-	"htwkalender/data-manager/service/db"
+	"htwkalender/data-manager/service/feed"
 	"htwkalender/data-manager/service/ical"
 	"io"
 	"log/slog"
@@ -58,7 +58,7 @@ func addFeedRoutes(app *pocketbase.PocketBase) {
 			Path:   "/api/feed",
 			Handler: func(c echo.Context) error {
 				token := c.QueryParam("token")
-				err := db.DeleteFeed(app.Dao(), token)
+				err := feed.MarkFeedForDeletion(app.Dao(), token)
 				if err != nil {
 					return c.JSON(http.StatusNotFound, err)
 				} else {

services/data-manager/service/db/dbFeeds.go

@@ -84,3 +84,22 @@ func GetAllFeeds(db *daos.Dao) ([]model.Feed, error) {
 	}
 	return feeds, nil
 }
+
+func MarkForDelete(db *daos.Dao, token string) error {
+	// get record from db
+	feed := model.Feed{}
+	err := db.DB().Select("*").From("feeds").Where(dbx.NewExp("id = {:id}", dbx.Params{"id": token})).One(&feed)
+	if err != nil {
+		return err
+	}
+	// set delete flag
+	feed.Deleted = true
+	feed.Modules = "[\n  {\n    \"uuid\": \"\",\n    \"name\": \"Deleted\",\n    \"course\": \"\",\n    \"userDefinedName\": \"Deleted\",\n    \"reminder\": false\n  }\n]"
+
+	// save record
+	err = db.Save(&feed)
+	if err != nil {
+		return err
+	}
+	return nil
+}

services/data-manager/service/feed/feedFunctions.go

@@ -17,8 +17,6 @@
 package feed
 
 import (
-	"database/sql"
-	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/daos"
 	"htwkalender/data-manager/model"
 	database "htwkalender/data-manager/service/db"
@@ -41,13 +39,9 @@ func ClearFeeds(db *daos.Dao, months int, clock localTime.Clock) {
 
 		if feedRetrievedTime.Before(timeShift) {
 			// delete feed
-			var sqlResult sql.Result
-			sqlResult, err = db.DB().Delete("feeds", dbx.NewExp("id = {:id}", dbx.Params{"id": feed.GetId()})).Execute()
-			if err != nil {
-				slog.Error("CleanFeeds: delete feed "+feed.GetId()+" failed", "error", err)
-				slog.Error("SQL Result: ", "error", sqlResult)
-			} else {
-				slog.Info("CleanFeeds: delete feed " + feed.GetId() + " successful")
+			feedErr := database.DeleteFeed(db, feed.GetId())
+			if feedErr != nil {
+				slog.Error("CleanFeeds: failed to delete feed: "+feed.GetId(), "error", feedErr)
 			}
 		}
 	}
@@ -124,3 +118,7 @@ func combineRooms(events model.Events, index1 int, combinedEvents model.Events,
 	}
 	return combinedEvents[index2].Rooms
 }
+
+func MarkFeedForDeletion(db *daos.Dao, feedId string) error {
+	return database.MarkForDelete(db, feedId)
+}