feat:#11 merge conflicts

backend/service/addRoute.go

@@ -12,16 +12,10 @@ import (
 	"io"
 	"net/http"
 	"net/url"
-	"os"
 )
 
 func AddRoutes(app *pocketbase.PocketBase) {
 
-	app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
-		e.Router.GET("/*", apis.StaticDirectoryHandler(os.DirFS("./pb_public"), false))
-		return nil
-	})
-
 	app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
 		_, err := e.Router.AddRoute(echo.Route{
 			Method: http.MethodGet,
@@ -39,6 +33,24 @@ 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/modules",
+			Handler: func(c echo.Context) error {
+				return events.DeleteAllEvents(app)
+			},
+			Middlewares: []echo.MiddlewareFunc{
+				apis.ActivityLogger(app),
+				apis.RequireAdminAuth(),
+			},
+		})
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+
 	app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
 		_, err := e.Router.AddRoute(echo.Route{
 			Method: http.MethodGet,
@@ -243,4 +255,27 @@ func AddRoutes(app *pocketbase.PocketBase) {
 		}
 		return nil
 	})
+
+	app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
+		_, err := e.Router.AddRoute(echo.Route{
+			Method: http.MethodGet,
+			Path:   "/api/feed/migrate",
+			Handler: func(c echo.Context) error {
+				err := ical.MigrateFeedJson(app)
+
+				if err != nil {
+					return c.JSON(500, err)
+				} else {
+					return c.JSON(200, "Migrated")
+				}
+			},
+			Middlewares: []echo.MiddlewareFunc{
+				apis.ActivityLogger(app),
+			},
+		})
+		if err != nil {
+			return err
+		}
+		return nil
+	})
 }

backend/service/db/dbEvents.go

@@ -180,6 +180,17 @@ func DeleteAllEventsForCourse(app *pocketbase.PocketBase, course string, semeste
 	return nil
 }
 
+func DeleteAllEvents(app *pocketbase.PocketBase) error {
+
+	_, err := app.Dao().DB().Delete("events", dbx.NewExp("1=1")).Execute()
+
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func FindAllEventsByModule(app *pocketbase.PocketBase, moduleName string) (model.Events, error) {
 	var events model.Events
 

backend/service/events/eventService.go

@@ -53,6 +53,7 @@ func GetModuleByName(app *pocketbase.PocketBase, name string) (model.Module, err
 		return model.Module{}, err
 	} else {
 		return model.Module{
+			UUID:     events[0].UUID,
 			Name:     name,
 			Events:   events,
 			Prof:     events[0].Prof,
@@ -74,6 +75,15 @@ func DeleteAllEventsByCourseAndSemester(app *pocketbase.PocketBase, course strin
 	}
 }
 
+func DeleteAllEvents(app *pocketbase.PocketBase) error {
+	err := db.DeleteAllEvents(app)
+	if err != nil {
+		return err
+	} else {
+		return nil
+	}
+}
+
 // UpdateModulesForCourse updates all modules for a course
 // Does Updates for ws and ss semester sequentially
 // Update runs through the following steps:

backend/service/fetch/fetchSeminarEventService.go

@@ -113,22 +113,23 @@ func parseSeminarGroup(result string) model.SeminarGroup {
 	splitEventsByWeekVal := splitEventsByWeek(eventsWithCombinedWeeks)
 	events := splitEventsBySingleWeek(splitEventsByWeekVal)
 	semesterString := findFirstSpanWithClass(table, "header-0-2-0").FirstChild.Data
+	course := findFirstSpanWithClass(table, "header-2-0-1").FirstChild.Data
 	semester, year := extractSemesterAndYear(semesterString)
 	events = convertWeeksToDates(events, semester, year)
-	events = generateUUIDs(events)
+	events = generateUUIDs(events, course)
 	events = splitEventType(events)
 	var seminarGroup = model.SeminarGroup{
 		University: findFirstSpanWithClass(table, "header-1-0-0").FirstChild.Data,
-		Course:     findFirstSpanWithClass(table, "header-2-0-1").FirstChild.Data,
+		Course:     course,
 		Events:     events,
 	}
 	return seminarGroup
 }
 
-func generateUUIDs(events []model.Event) []model.Event {
+func generateUUIDs(events []model.Event, course string) []model.Event {
 	for i, event := range events {
 		// generate a hash value from the event name, course and semester
-		hash := uuid.NewSHA1(uuid.NameSpaceOID, []byte(event.Name+event.Course+event.Semester))
+		hash := uuid.NewSHA1(uuid.NameSpaceOID, []byte(event.Name+course))
 		events[i].UUID = hash.String()
 	}
 	return events

backend/service/fetch/fetchSeminarEventService_test.go

@@ -208,3 +208,57 @@ func Test_splitEventType(t *testing.T) {
 		})
 	}
 }
+
+func Test_generateUUIDs(t *testing.T) {
+	type args struct {
+		events []model.Event
+		course string
+	}
+	tests := []struct {
+		name string
+		args args
+		want []model.Event
+	}{
+		{
+			name: "Test 1",
+			args: args{
+				events: []model.Event{
+					{
+						Name: " Arbeitssicherheit / Rechtsformen von Unternehmen B435 SBB  (wpf) & B348 BIB (pf) 5. FS",
+					},
+				},
+				course: "21BIB-2a",
+			},
+			want: []model.Event{
+				{
+					Name: " Arbeitssicherheit / Rechtsformen von Unternehmen B435 SBB  (wpf) & B348 BIB (pf) 5. FS",
+					UUID: "3720afdc-10c7-5b72-9489-cffb70cb0c13",
+				},
+			},
+		},
+		{
+			name: "Test 2",
+			args: args{
+				events: []model.Event{
+					{
+						Name: " Arbeitssicherheit / Rechtsformen von Unternehmen B435 SBB  (wpf) & B348 BIB (pf) 5. FS",
+					},
+				},
+				course: "21BIB-2b",
+			},
+			want: []model.Event{
+				{
+					Name: " Arbeitssicherheit / Rechtsformen von Unternehmen B435 SBB  (wpf) & B348 BIB (pf) 5. FS",
+					UUID: "81083480-bcf1-5452-af84-bb27d79282d8",
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := generateUUIDs(tt.args.events, tt.args.course); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("generateUUIDs() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

backend/service/ical/ical.go

@@ -16,8 +16,6 @@ import (
 const expirationTime = 5 * time.Minute
 
 func Feed(c echo.Context, app *pocketbase.PocketBase, token string) error {
-	layout := "2006-01-02 15:04:05 -0700 MST"
-
 	var result string
 	var responseWriter = c.Response().Writer
 	feed, err := db.FindFeedByToken(token, app)
@@ -25,11 +23,11 @@ func Feed(c echo.Context, app *pocketbase.PocketBase, token string) error {
 		return c.JSON(http.StatusNotFound, err)
 	}
 
-	created, _ := time.Parse(layout, feed.Created)
+	created := feed.Created
 
 	var modules []model.FeedCollection
 	_ = json.Unmarshal([]byte(feed.Modules), &modules)
-	if created.Add(time.Hour * 265).Before(time.Now()) {
+	if created.Time().Add(time.Hour * 265).Before(time.Now()) {
 		newFeed, err := createFeedForToken(app, modules)
 		if err != nil {
 			return c.JSON(http.StatusInternalServerError, err)

backend/service/ical/icalJsonMigrate.go

@@ -0,0 +1,58 @@
+package ical
+
+import (
+	"encoding/json"
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase"
+	"htwkalender/model"
+)
+
+//update ical feed json
+//add uuid field
+//remove module name field
+
+func MigrateFeedJson(app *pocketbase.PocketBase) error {
+
+	records, err := app.Dao().FindRecordsByFilter("feeds", "1=1", "-created", 0, 0)
+	if err != nil {
+		return err
+	}
+
+	for _, feed := range records {
+
+		var modules []model.FeedCollection
+
+		err := json.Unmarshal([]byte(feed.GetString("modules")), &modules)
+		if err != nil {
+			return err
+		}
+
+		var uuidFeedCollections []model.FeedCollection
+
+		for _, module := range modules {
+			uuid := searchUUIDForModule(app, module)
+
+			if uuid != "" {
+				uuidFeedCollections = append(uuidFeedCollections, model.FeedCollection{UUID: uuid, Name: module.Name, Course: module.Course, UserDefinedName: module.UserDefinedName})
+			}
+		}
+
+		jsonModules, _ := json.Marshal(uuidFeedCollections)
+		feed.Set("modules", string(jsonModules))
+
+		err = app.Dao().SaveRecord(feed)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func searchUUIDForModule(app *pocketbase.PocketBase, module model.FeedCollection) string {
+	var event model.Event
+	err := app.Dao().DB().Select("*").From("events").Where(dbx.NewExp("Name = {:name} AND course = {:course}", dbx.Params{"name": module.Name, "course": module.Course})).One(&event)
+	if err != nil {
+		return ""
+	}
+	return event.UUID
+}