OwlBoard/timetable-mgr
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

timetable-extension #1

Open
fred.boniface wants to merge 160 commits from timetable-extension into main
pull from: timetable-extension
merge into: OwlBoard:main
Conversation 0 Commits 160 Files Changed 67 +15 -1
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2374a3ca37 - Show all commits

2
src/cif/check.go
View File

@ -41,7 +41,7 @@ func parseMetadata(metadata *dbAccess.CifMetadata, cfg *helpers.Configuration) e
} }
log.Msg.Debug("Requesting CIF Data Update") log.Msg.Debug("Requesting CIF Data Update")
newMeta, err := runUpdate("daily", metadata) newMeta, err := runUpdate(metadata, cfg)
if err != nil { if err != nil {
return err return err
} }

11
src/cif/process.go
View File

@ -1,5 +1,16 @@
package cif package cif
import (
"git.fjla.uk/owlboard/go-types/pkg/upstreamApi"
"git.fjla.uk/owlboard/timetable-mgr/dbAccess"
)
// Probably looking to return some kind of array, containing the database actions. Associations aren't needed at the moment.
// however, maybe I need to process them too. I need to plan how to return the data properly.
func parseCifData(data []byte, metadata *dbAccess.CifMetadata) (*[]upstreamApi.CifScheduleSegment, error) {
return nil, nil
}
// Handles documents from CIF and VSTP Feeds. // Handles documents from CIF and VSTP Feeds.
// Takes in individual documents, and returns them in the correct format for the Database // Takes in individual documents, and returns them in the correct format for the Database
// Uses types declared in owlboard/go-types/db // Uses types declared in owlboard/go-types/db

3
src/cif/update.go
View File

@ -55,6 +55,7 @@ func runUpdate(metadata *dbAccess.CifMetadata, cfg *helpers.Configuration) (*dbA
newMeta, err := runFullUpdate(cfg) newMeta, err := runFullUpdate(cfg)
if err != nil { if err != nil {
log.Msg.Error("CIF Update failed", zap.Error(err)) log.Msg.Error("CIF Update failed", zap.Error(err))
return nil, err
} }
return newMeta, nil return newMeta, nil
} }
@ -72,6 +73,8 @@ func runUpdate(metadata *dbAccess.CifMetadata, cfg *helpers.Configuration) (*dbA
return dates[i].Before(dates[j]) return dates[i].Before(dates[j])
}) })
log.Msg.Info("Updating CIF Data", zap.Any("dates to update", dates))
// Iterate over each date, fetching then parsing the data // Iterate over each date, fetching then parsing the data
for _, date := range dates { for _, date := range dates {
data, err := fetchUpdate(date, cfg) data, err := fetchUpdate(date, cfg)