HTWK/htwkalender-pwa
1
0
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender-pwa.git synced 2025-08-07 12:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix:#25 changed course updater insert and delete procedure

Browse Source
This commit is contained in:
Elmar Kresse
2024-04-21 11:59:20 +02:00
parent e13dad48b4
commit c8bcc3be94
4 changed files with 100 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
backend/service/db/dbEvents.go
View File

@@ -27,12 +27,11 @@ import (
"github.com/pocketbase/pocketbase"
)
func SaveSeminarGroupEvents(seminarGroups []model.SeminarGroup, app *pocketbase.PocketBase) ([]model.Event, error) {
func SaveSeminarGroupEvents(seminarGroup model.SeminarGroup, app *pocketbase.PocketBase) ([]model.Event, error) {
var toBeSavedEvents model.Events
var savedRecords model.Events
// check if event is already in database and add to toBeSavedEvents if not
for _, seminarGroup := range seminarGroups {
for _, event := range seminarGroup.Events {
event = event.SetCourse(seminarGroup.Course)
existsInDatabase, err := findEventByDayWeekStartEndNameCourse(event, seminarGroup.Course, app)
@@ -46,7 +45,6 @@ func SaveSeminarGroupEvents(seminarGroups []model.SeminarGroup, app *pocketbase.
toBeSavedEvents = append(toBeSavedEvents, event)
}
}
}
// create record for each event that's not already in the database
for _, event := range toBeSavedEvents {
@@ -366,3 +364,13 @@ func GetEventsThatStartAfterAndEndAfter(app *pocketbase.PocketBase, from types.D
return events, nil
}
func DeleteEvents(list model.Events, app *pocketbase.PocketBase) error {
for _, event := range list {
err := app.Dao().Delete(&event)
if err != nil {
return err
}
}
return nil
}

51
backend/service/events/eventService.go
View File

@@ -22,6 +22,7 @@ import (
"htwkalender/service/db"
"htwkalender/service/fetch/v1"
"htwkalender/service/functions"
"log/slog"
)
func GetModulesForCourseDistinct(app *pocketbase.PocketBase, course string, semester string) (model.Events, error) {
@@ -120,15 +121,11 @@ func DeleteAllEvents(app *pocketbase.PocketBase) error {
// If the update was not successful, an error is returned
func UpdateModulesForCourse(app *pocketbase.PocketBase, course string) (model.Events, error) {
//new string array with one element (course)
var courses []string
courses = append(courses, course)
seminarGroup := v1.GetSeminarGroupEventsFromHTML(course)
seminarGroups := v1.GetSeminarGroupsEventsFromHTML(courses)
seminarGroup = v1.ClearEmptySeminarGroups(seminarGroup)
seminarGroups = v1.ClearEmptySeminarGroups(seminarGroups)
seminarGroups = v1.ReplaceEmptyEventNames(seminarGroups)
seminarGroup = v1.ReplaceEmptyEventNames(seminarGroup)
//check if events in the seminarGroups Events are already in the database
//if yes, keep the database as it is
@@ -151,43 +148,45 @@ func UpdateModulesForCourse(app *pocketbase.PocketBase, course string) (model.Ev
//if there are no events in the database, save the new events
if len(events) == 0 {
events, dbError := db.SaveSeminarGroupEvents(seminarGroups, app)
events, dbError := db.SaveSeminarGroupEvents(seminarGroup, app)
if dbError != nil {
return nil, dbError
}
return events, nil
}
//check if events in the seminarGroups Events are already in the database
//if yes, keep the database as it is
//if no, delete all events for the course and the semester and save the new events
// Create partial update list and delete list for the events
var insertList model.Events
var deleteList model.Events
var savedEvents model.Events
for _, seminarGroup := range seminarGroups {
// check which events are not already in the database and need to be inserted/saved
for _, event := range seminarGroup.Events {
// if the event is not in the database, delete all events for the course and the semester and save the new events
if !ContainsEvent(events, event) {
insertList = append(insertList, event)
}
}
err = DeleteAllEventsByCourseAndSemester(app, course, "ws")
// save all events that are in the insertList
savedEvents, err := db.SaveEvents(insertList, app)
if err != nil {
slog.Error("Failed to save events: %v", err)
return nil, err
}
err = DeleteAllEventsByCourseAndSemester(app, course, "ss")
// check which events are in the database but not in the seminarGroup and need to be deleted
for _, event := range events {
if !ContainsEvent(seminarGroup.Events, event) {
deleteList = append(deleteList, event)
}
}
// delete all events that are in the deleteList
err = db.DeleteEvents(deleteList, app)
if err != nil {
slog.Error("Failed to delete events: %v", err)
return nil, err
}
//save the new events
savedEvent, dbError := db.SaveSeminarGroupEvents(seminarGroups, app)
if dbError != nil {
return nil, dbError
}
savedEvents = append(savedEvents, savedEvent...)
}
}
}
return savedEvents, nil
}

33
backend/service/fetch/v1/fetchSeminarEventService.go
View File

@@ -32,37 +32,32 @@ import (
"time"
)
func ReplaceEmptyEventNames(groups []model.SeminarGroup) []model.SeminarGroup {
for i, group := range groups {
func ReplaceEmptyEventNames(group model.SeminarGroup) model.SeminarGroup {
for j, event := range group.Events {
if functions.OnlyWhitespace(event.Name) {
groups[i].Events[j].Name = "Sonderveranstaltungen"
group.Events[j].Name = "Sonderveranstaltungen"
}
}
}
return groups
return group
}
func ClearEmptySeminarGroups(seminarGroups []model.SeminarGroup) []model.SeminarGroup {
var newSeminarGroups []model.SeminarGroup
for _, seminarGroup := range seminarGroups {
func ClearEmptySeminarGroups(seminarGroup model.SeminarGroup) model.SeminarGroup {
var newSeminarGroup = model.SeminarGroup{}
if len(seminarGroup.Events) > 0 && seminarGroup.Course != "" {
newSeminarGroups = append(newSeminarGroups, seminarGroup)
newSeminarGroup = seminarGroup
}
}
return newSeminarGroups
return newSeminarGroup
}
func GetSeminarGroupsEventsFromHTML(seminarGroupsLabel []string) []model.SeminarGroup {
var seminarGroups []model.SeminarGroup
for _, seminarGroupLabel := range seminarGroupsLabel {
func GetSeminarGroupEventsFromHTML(seminarGroupLabel string) model.SeminarGroup {
var seminarGroup model.SeminarGroup
if (time.Now().Month() >= 3) && (time.Now().Month() <= 10) {
ssUrl := "https://stundenplan.htwk-leipzig.de/" + string("ss") + "/Berichte/Text-Listen;Studenten-Sets;name;" + seminarGroupLabel + "?template=sws_semgrp&weeks=1-65"
result, getError := fetch.GetHTML(ssUrl)
if getError == nil {
seminarGroup := parseSeminarGroup(result)
seminarGroups = append(seminarGroups, seminarGroup)
seminarGroup = parseSeminarGroup(result)
}
}
@@ -70,12 +65,10 @@ func GetSeminarGroupsEventsFromHTML(seminarGroupsLabel []string) []model.Seminar
wsUrl := "https://stundenplan.htwk-leipzig.de/" + string("ws") + "/Berichte/Text-Listen;Studenten-Sets;name;" + seminarGroupLabel + "?template=sws_semgrp&weeks=1-65"
result, getError := fetch.GetHTML(wsUrl)
if getError == nil {
seminarGroup := parseSeminarGroup(result)
seminarGroups = append(seminarGroups, seminarGroup)
seminarGroup = parseSeminarGroup(result)
}
}
}
return seminarGroups
return seminarGroup
}
func SplitEventType(events []model.Event) ([]model.Event, error) {

22
backend/service/fetch/v1/fetchSeminarEventService_test.go
View File

@@ -75,18 +75,17 @@ func Test_extractSemesterAndYear(t *testing.T) {
func Test_replaceEmptyEventNames(t *testing.T) {
type args struct {
groups []model.SeminarGroup
group model.SeminarGroup
}
tests := []struct {
name string
args args
want []model.SeminarGroup
want model.SeminarGroup
}{
{
name: "Test 1",
args: args{
groups: []model.SeminarGroup{
{
group: model.SeminarGroup{
Events: []model.Event{
{
Name: "Test",
@@ -94,9 +93,7 @@ func Test_replaceEmptyEventNames(t *testing.T) {
},
},
},
},
want: []model.SeminarGroup{
{
want: model.SeminarGroup{
Events: []model.Event{
{
Name: "Test",
@@ -104,12 +101,10 @@ func Test_replaceEmptyEventNames(t *testing.T) {
},
},
},
},
{
name: "Test 1",
args: args{
groups: []model.SeminarGroup{
{
group: model.SeminarGroup{
Events: []model.Event{
{
Name: "",
@@ -117,9 +112,7 @@ func Test_replaceEmptyEventNames(t *testing.T) {
},
},
},
},
want: []model.SeminarGroup{
{
want: model.SeminarGroup{
Events: []model.Event{
{
Name: "Sonderveranstaltungen",
@@ -127,11 +120,10 @@ func Test_replaceEmptyEventNames(t *testing.T) {
},
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if got := ReplaceEmptyEventNames(tt.args.groups); !reflect.DeepEqual(got, tt.want) {
if got := ReplaceEmptyEventNames(tt.args.group); !reflect.DeepEqual(got, tt.want) {
t.Errorf("ReplaceEmptyEventNames() = %v, want %v", got, tt.want)
}
})