feat:#26 added semester to fetched groups

backend/service/fetch/v1/fetchSeminarGroupService.go

@@ -57,8 +57,8 @@ func FetchSeminarGroups(app *pocketbase.PocketBase) ([]*models.Record, error) {
 		return nil, err
 	}
 
-	groups = parseSeminarGroups(resultSummer)
-	groups = append(groups, parseSeminarGroups(resultWinter)...)
+	groups = parseSeminarGroups(resultSummer, "ss")
+	groups = append(groups, parseSeminarGroups(resultWinter, "ws")...)
 
 	// filter duplicates
 	groups = removeDuplicates(groups)
@@ -91,14 +91,14 @@ func removeDuplicates(groups []model.SeminarGroup) []model.SeminarGroup {
 
 func contains(groups []model.SeminarGroup, group model.SeminarGroup) bool {
 	for _, a := range groups {
-		if a.Course == group.Course {
+		if (a.Course == group.Course) && (a.Semester == group.Semester) {
 			return true
 		}
 	}
 	return false
 }
 
-func parseSeminarGroups(result string) []model.SeminarGroup {
+func parseSeminarGroups(result string, semester string) []model.SeminarGroup {
 
 	var studium model.Studium
 	err := xml.Unmarshal([]byte(result), &studium)
@@ -107,16 +107,17 @@ func parseSeminarGroups(result string) []model.SeminarGroup {
 	}
 
 	var seminarGroups []model.SeminarGroup
-	for _, Fakultaet := range studium.Fakultaet {
-		for _, Studiengang := range Fakultaet.Studiengang {
+	for _, faculty := range studium.Faculty {
+		for _, Studiengang := range faculty.Studiengang {
 			for _, Studienrichtung := range Studiengang.Semgrp {
 				seminarGroup := model.SeminarGroup{
 					University:    "HTWK-Leipzig",
 					GroupShortcut: Studiengang.Name,
 					GroupId:       Studiengang.ID,
 					Course:        Studienrichtung.Name,
-					Faculty:       Fakultaet.Name,
-					FacultyId:     Fakultaet.ID,
+					Faculty:       faculty.Name,
+					FacultyId:     faculty.ID,
+					Semester:      semester,
 				}
 				seminarGroups = append(seminarGroups, seminarGroup)
 			}

backend/service/fetch/v1/fetchSeminarGroupService_test.go

@@ -0,0 +1,75 @@
+package v1
+
+import (
+	"htwkalender/model"
+	"testing"
+)
+
+func Test_contains(t *testing.T) {
+	type args struct {
+		groups []model.SeminarGroup
+		group  model.SeminarGroup
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		{
+			name: "should return true if group is in groups",
+			args: args{
+				groups: []model.SeminarGroup{
+					{
+						Course:   "test",
+						Semester: "test",
+					},
+				},
+				group: model.SeminarGroup{
+					Course:   "test",
+					Semester: "test",
+				},
+			},
+			want: true,
+		},
+		{
+			name: "should return false if group is not in groups",
+			args: args{
+				groups: []model.SeminarGroup{
+					{
+						Course:   "test",
+						Semester: "test",
+					},
+				},
+				group: model.SeminarGroup{
+					Course:   "test",
+					Semester: "test2",
+				},
+			},
+			want: false,
+		},
+		{
+			name: "should return false if group is not in courses",
+			args: args{
+				groups: []model.SeminarGroup{
+					{
+						Course:   "test3",
+						Semester: "test",
+					},
+				},
+				group: model.SeminarGroup{
+					Course:   "test",
+					Semester: "test",
+				},
+			},
+			want: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := contains(tt.args.groups, tt.args.group); got != tt.want {
+				t.Errorf("contains() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}