diff --git a/backend/model/feedModel.go b/backend/model/feedModel.go index 516ae8a..cc2e413 100644 --- a/backend/model/feedModel.go +++ b/backend/model/feedModel.go @@ -2,12 +2,12 @@ package model import ( "github.com/pocketbase/pocketbase/models" - "time" + "github.com/pocketbase/pocketbase/tools/types" ) type Feed struct { - Modules string `db:"modules" json:"modules"` - Retrieved time.Time `db:"retrieved" json:"retrieved"` + Modules string `db:"modules" json:"modules"` + Retrieved types.DateTime `db:"retrieved" json:"retrieved"` models.BaseModel } diff --git a/backend/service/addSchedule.go b/backend/service/addSchedule.go index 280cb32..bd0cd96 100644 --- a/backend/service/addSchedule.go +++ b/backend/service/addSchedule.go @@ -4,10 +4,9 @@ import ( "github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/tools/cron" - "htwkalender/service/db" - "htwkalender/service/events" - "log" - "time" + "htwkalender/service/course" + "htwkalender/service/feed" + "htwkalender/service/functions/time" ) func AddSchedules(app *pocketbase.PocketBase) { @@ -19,37 +18,13 @@ func AddSchedules(app *pocketbase.PocketBase) { // Every three hours update all courses (5 segments - minute, hour, day, month, weekday) "0 */3 * * *" // Every 10 minutes update all courses (5 segments - minute, hour, day, month, weekday) "*/10 * * * *" scheduler.MustAdd("updateCourse", "0 */3 * * *", func() { - courses := events.GetAllCourses(app) - for _, course := range courses { - err := events.UpdateModulesForCourse(app, course) - if err != nil { - log.Println("Update Course: " + course + " failed") - log.Println(err) - } else { - log.Println("Update Course: " + course + " successful") - } - } + course.UpdateCourse(app) }) // Every sunday at 3am clean all courses (5 segments - minute, hour, day, month, weekday) "0 3 * * 0" scheduler.MustAdd("cleanFeeds", "0 3 * * 0", func() { - feeds, err := db.GetAllFeeds(app) - if err != nil { - log.Println("CleanFeeds: get all feeds failed") - return - } - for _, feed := range feeds { - // if retrieved time is older than a half year delete feed - if feed.GetTime("retrieved").Before(time.Now().AddDate(0, -6, 0)) { - err = app.Dao().DeleteRecord(feed) - if err != nil { - log.Println("CleanFeeds: delete feed " + feed.GetId() + " failed") - log.Println(err) - } else { - log.Println("CleanFeeds: delete feed " + feed.GetId() + " successful") - } - } - } + // clean feeds older than 6 months + feed.ClearFeeds(app.Dao(), 6, time.RealClock{}) }) scheduler.Start() return nil diff --git a/backend/service/course/courseFunctions.go b/backend/service/course/courseFunctions.go new file mode 100644 index 0000000..0d24700 --- /dev/null +++ b/backend/service/course/courseFunctions.go @@ -0,0 +1,20 @@ +package course + +import ( + "github.com/pocketbase/pocketbase" + "htwkalender/service/events" + "log" +) + +func UpdateCourse(app *pocketbase.PocketBase) { + courses := events.GetAllCourses(app) + for _, course := range courses { + err := events.UpdateModulesForCourse(app, course) + if err != nil { + log.Println("Update Course: " + course + " failed") + log.Println(err) + } else { + log.Println("Update Course: " + course + " successful") + } + } +} diff --git a/backend/service/db/dbFeeds.go b/backend/service/db/dbFeeds.go index f2f0804..408d763 100644 --- a/backend/service/db/dbFeeds.go +++ b/backend/service/db/dbFeeds.go @@ -2,6 +2,7 @@ package db import ( "github.com/pocketbase/pocketbase" + "github.com/pocketbase/pocketbase/daos" "github.com/pocketbase/pocketbase/models" "htwkalender/model" "time" @@ -28,7 +29,7 @@ func FindFeedByToken(token string, app *pocketbase.PocketBase) (*model.Feed, err var feed model.Feed feed.Modules = record.GetString("modules") - feed.Retrieved = record.GetTime("retrieved") + feed.Retrieved = record.GetDateTime("retrieved") //update retrieved time record.Set("retrieved", time.Now()) @@ -38,8 +39,9 @@ func FindFeedByToken(token string, app *pocketbase.PocketBase) (*model.Feed, err return &feed, err } -func GetAllFeeds(app *pocketbase.PocketBase) ([]*models.Record, error) { - feeds, err := app.Dao().FindRecordsByFilter("feeds", "", "", 0, 0) +func GetAllFeeds(db *daos.Dao) ([]model.Feed, error) { + var feeds []model.Feed + err := db.DB().Select("*").From("feeds").All(&feeds) if err != nil { return nil, err } diff --git a/backend/service/feed/feedFunctions.go b/backend/service/feed/feedFunctions.go new file mode 100644 index 0000000..853a144 --- /dev/null +++ b/backend/service/feed/feedFunctions.go @@ -0,0 +1,35 @@ +package feed + +import ( + "github.com/pocketbase/dbx" + "github.com/pocketbase/pocketbase/daos" + database "htwkalender/service/db" + localTime "htwkalender/service/functions/time" + "log" +) + +func ClearFeeds(db *daos.Dao, months int, clock localTime.Clock) { + feeds, err := database.GetAllFeeds(db) + if err != nil { + log.Println("CleanFeeds: get all feeds failed") + return + } + for _, feed := range feeds { + // if retrieved time is older than a half year delete feed + now := clock.Now() + feedRetrievedTime := feed.Retrieved.Time() + timeShift := now.AddDate(0, -months, 0) + + if feedRetrievedTime.Before(timeShift) { + // delete feed + sqlResult, err := db.DB().Delete("feeds", dbx.NewExp("id = {:id}", dbx.Params{"id": feed.GetId()})).Execute() + if err != nil { + log.Println("CleanFeeds: delete feed " + feed.GetId() + " failed") + log.Println(err) + log.Println(sqlResult) + } else { + log.Println("CleanFeeds: delete feed " + feed.GetId() + " successful") + } + } + } +} diff --git a/backend/service/feed/feedFunctions_test.go b/backend/service/feed/feedFunctions_test.go new file mode 100644 index 0000000..5eb1182 --- /dev/null +++ b/backend/service/feed/feedFunctions_test.go @@ -0,0 +1,83 @@ +package feed + +import ( + "github.com/pocketbase/pocketbase/daos" + "github.com/pocketbase/pocketbase/tests" + "htwkalender/model" + mockTime "htwkalender/service/functions/time" + "testing" + "time" +) + +const testDataDir = "./mockData" + +func TestClearFeeds(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 + months int + mockClock mockTime.MockClock + } + testCases := []struct { + name string + args args + want int + }{ + { + name: "TestClearFeeds", + args: args{ + db: setupTestApp(t), + months: 6, + mockClock: mockTime.MockClock{ + NowTime: time.Date(2023, 12, 1, 0, 0, 0, 0, time.UTC), + }, + }, + want: 1, + }, + { + name: "TestClearAllFeeds", + args: args{ + db: setupTestApp(t), + months: 1, + mockClock: mockTime.MockClock{ + NowTime: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC), + }, + }, + want: 0, + }, + { + name: "TestClearFeedsClearBeforeRetrievedTime", + args: args{ + db: setupTestApp(t), + months: 1, + mockClock: mockTime.MockClock{ + NowTime: time.Date(2010, 1, 1, 0, 0, 0, 0, time.UTC), + }, + }, + want: 3, + }, + } + for _, tt := range testCases { + t.Run(tt.name, func(t *testing.T) { + ClearFeeds(tt.args.db, tt.args.months, tt.args.mockClock) + // count all feeds in db + var feeds []*model.Feed + err := tt.args.db.DB().Select("id").From("feeds").All(&feeds) + if err != nil { + t.Fatal(err) + } + if got := len(feeds); got != tt.want { + t.Errorf("ClearFeeds() = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/backend/service/feed/mockData/data.db b/backend/service/feed/mockData/data.db new file mode 100644 index 0000000..acca65d Binary files /dev/null and b/backend/service/feed/mockData/data.db differ diff --git a/backend/service/feed/mockData/logs.db b/backend/service/feed/mockData/logs.db new file mode 100644 index 0000000..1391d96 Binary files /dev/null and b/backend/service/feed/mockData/logs.db differ diff --git a/backend/service/functions/time/mockClock.go b/backend/service/functions/time/mockClock.go new file mode 100644 index 0000000..a81ab04 --- /dev/null +++ b/backend/service/functions/time/mockClock.go @@ -0,0 +1,10 @@ +package time + +import "time" + +type MockClock struct { + NowTime time.Time +} + +func (m MockClock) Now() time.Time { return m.NowTime } +func (MockClock) After(d time.Duration) <-chan time.Time { return time.After(d) } diff --git a/backend/service/functions/time/realClock.go b/backend/service/functions/time/realClock.go new file mode 100644 index 0000000..290b298 --- /dev/null +++ b/backend/service/functions/time/realClock.go @@ -0,0 +1,8 @@ +package time + +import "time" + +type RealClock struct{} + +func (RealClock) Now() time.Time { return time.Now() } +func (RealClock) After(d time.Duration) <-chan time.Time { return time.After(d) } diff --git a/backend/service/functions/time/time.go b/backend/service/functions/time/time.go new file mode 100644 index 0000000..bc58b8e --- /dev/null +++ b/backend/service/functions/time/time.go @@ -0,0 +1,8 @@ +package time + +import "time" + +type Clock interface { + Now() time.Time + After(d time.Duration) <-chan time.Time +}