mirror of
https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git
synced 2025-08-03 18:29:14 +02:00
feat:#44 updated delete process and api response
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
Reference in New Issue
Block a user