feat:#44 updated delete process and api response

This commit is contained in:
Elmar Kresse
2024-07-13 16:46:28 +02:00
parent 0addcd72a6
commit 1f9e9614aa
17 changed files with 226 additions and 15 deletions

View File

@@ -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)
}