HTWK/htwkalender
1
1
Fork 0
mirror of https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git synced 2025-08-03 18:29:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix:#46 updated fetcher and empty course issue

Browse Source
This commit is contained in:
Elmar Kresse
2024-07-05 15:23:10 +02:00
parent a5a8c2a58d
commit ab22364ac8
7 changed files with 76 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
services/data-manager/service/fetch/v1/fetchSeminarEventService.go
View File

@@ -41,16 +41,12 @@ func ReplaceEmptyEventNames(group model.SeminarGroup) model.SeminarGroup {
return group
}
func ClearEmptySeminarGroups(seminarGroup model.SeminarGroup) model.SeminarGroup {
var newSeminarGroup = model.SeminarGroup{}
if len(seminarGroup.Events) > 0 && seminarGroup.Course != "" {
newSeminarGroup = seminarGroup
}
return newSeminarGroup
}
func fetchHTMLFromURL(semester, seminarGroupLabel string) (string, error) {
// check that semester and seminarGroupLabel are not empty
if semester == "" || seminarGroupLabel == "" {
return "", fmt.Errorf("semester or seminarGroupLabel is empty")
}
url := "https://stundenplan.htwk-leipzig.de/" + semester + "/Berichte/Text-Listen;Studenten-Sets;name;" + seminarGroupLabel + "?template=sws_semgrp&weeks=1-65"
result, err := fetch.GetHTML(url)
if err != nil {
@@ -60,22 +56,6 @@ func fetchHTMLFromURL(semester, seminarGroupLabel string) (string, error) {
return result, nil
}
func GetSeminarGroupEventsFromHTML(seminarGroupLabel string) (model.SeminarGroup, error) {
var seminarGroup [2]model.SeminarGroup
var errSS, errWS error
currentMonth := time.Now().Month()
if isSummerSemester(currentMonth) {
seminarGroup[0], errSS = fetchAndParse("ss", seminarGroupLabel)
}
if isWinterSemester(currentMonth) {
seminarGroup[1], errWS = fetchAndParse("ws", seminarGroupLabel)
}
return checkForSuccessfulFetch(errSS, errWS, seminarGroup)
}
func isSummerSemester(month time.Month) bool {
return month >= 3 && month <= 10
}
@@ -84,7 +64,7 @@ func isWinterSemester(month time.Month) bool {
return month >= 9 || month <= 4
}
func fetchAndParse(season, label string) (model.SeminarGroup, error) {
func FetchAndParse(season, label string) (model.SeminarGroup, error) {
result, err := fetchHTMLFromURL(season, label)
if err != nil {
return model.SeminarGroup{}, err
@@ -92,20 +72,6 @@ func fetchAndParse(season, label string) (model.SeminarGroup, error) {
return parseSeminarGroup(result), nil
}
func checkForSuccessfulFetch(errSS error, errWS error, seminarGroup [2]model.SeminarGroup) (model.SeminarGroup, error) {
switch {
case errSS != nil && errWS != nil:
return model.SeminarGroup{}, errWS
case errSS != nil:
return seminarGroup[1], nil
case errWS != nil:
return seminarGroup[0], nil
default:
seminarGroup[0].Events = append(seminarGroup[0].Events, seminarGroup[1].Events...)
return seminarGroup[0], nil
}
}
func SplitEventType(events []model.Event) ([]model.Event, error) {
re, err := regexp.Compile("^([VPS])([wp])$")
if err != nil {
@@ -135,15 +101,21 @@ func parseSeminarGroup(result string) model.SeminarGroup {
eventTables := getEventTables(doc)
allDayLabels := getAllDayLabels(doc)
if eventTables == nil || allDayLabels == nil {
return model.SeminarGroup{}
}
course := findFirstSpanWithClass(table, "header-2-0-1").FirstChild.Data
semesterString := findFirstSpanWithClass(table, "header-0-2-0").FirstChild.Data
semester, year := extractSemesterAndYear(semesterString)
if eventTables == nil || allDayLabels == nil {
return model.SeminarGroup{
University: findFirstSpanWithClass(table, "header-1-0-0").FirstChild.Data,
Course: course,
Events: []model.Event{},
}
}
eventsWithCombinedWeeks := toEvents(eventTables, allDayLabels, course)
splitEventsByWeekVal := splitEventsByWeek(eventsWithCombinedWeeks)
events := splitEventsBySingleWeek(splitEventsByWeekVal)
semesterString := findFirstSpanWithClass(table, "header-0-2-0").FirstChild.Data
semester, year := extractSemesterAndYear(semesterString)
events = convertWeeksToDates(events, semester, year)
events = generateUUIDs(events, course)
events, err = SplitEventType(events)

3
services/data-manager/service/fetch/v1/fetchSeminarGroupService.go
View File

@@ -89,8 +89,9 @@ func removeDuplicates(groups db.SeminarGroups) db.SeminarGroups {
uniqueGroups := make(db.SeminarGroups, 0, len(groups))
seen := make(map[string]struct{}) // Use an empty struct to minimize memory usage
// unique Identifier is the course and semester
for _, group := range groups {
key := group.Course + group.Semester
key := group.UniqueKey()
if _, exists := seen[key]; !exists {
seen[key] = struct{}{}
uniqueGroups = append(uniqueGroups, group)