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

feat:#51 added mapping for room schedule request

Browse Source
This commit is contained in:
Elmar Kresse
2024-08-17 18:10:46 +02:00
parent db86ae7206
commit 91d56493c8
7 changed files with 120 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/data-manager/service/room/roomService.go
View File

@@ -42,12 +42,25 @@ func GetRoomScheduleForDay(app *pocketbase.PocketBase, room string, date string)
return anonymizedRoomSchedule, nil
}
func GetRoomSchedule(app *pocketbase.PocketBase, room string, from string, to string) ([]model.AnonymizedEventDTO, error) {
func GetRoomSchedule(app *pocketbase.PocketBase, room string, from string, to string, mapped string) ([]model.AnonymizedEventDTO, error) {
if mapped == "true" {
room = functions.MapRoom(room)
}
roomSchedule, err := db.GetRoomSchedule(app, room, from, to)
if err != nil {
return nil, err
}
anonymizedRoomSchedule := anonymizeRooms(roomSchedule)
// If mapped is "true", map the rooms again after anonymization
if mapped == "true" {
for i := range anonymizedRoomSchedule {
anonymizedRoomSchedule[i].Rooms = functions.MapRoom(anonymizedRoomSchedule[i].Rooms)
}
}
return anonymizedRoomSchedule, nil
}

42
services/data-manager/service/room/roomService_test.go
View File

@@ -56,12 +56,14 @@ func TestAnonymizeRooms(t *testing.T) {
},
want: []model.AnonymizedEventDTO{
{
Day: "Montag",
Week: "52",
Start: types.DateTime{},
End: types.DateTime{},
Rooms: "Room",
Free: false,
Day: "Montag",
Week: "52",
Start: types.DateTime{},
End: types.DateTime{},
Rooms: "Room",
Name: "Secret",
EventType: "V",
Free: false,
},
},
},
@@ -112,20 +114,24 @@ func TestAnonymizeRooms(t *testing.T) {
},
want: []model.AnonymizedEventDTO{
{
Day: "Montag",
Week: "51",
Start: types.DateTime{},
End: types.DateTime{},
Rooms: "Room",
Free: false,
Day: "Montag",
Week: "51",
Start: types.DateTime{},
End: types.DateTime{},
Rooms: "Room",
Name: "Incognito",
EventType: "V",
Free: false,
},
{
Day: "Dienstag",
Week: "52",
Start: types.DateTime{},
End: types.DateTime{},
Rooms: "Room",
Free: false,
Day: "Dienstag",
Week: "52",
Start: types.DateTime{},
End: types.DateTime{},
Rooms: "Room",
Name: "Private",
EventType: "S",
Free: false,
},
},
},