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 163 commits from timetable-extension into main
pull from: timetable-extension
merge into: OwlBoard:main
Conversation 0 Commits 163 Files Changed 67 +16 -20
5 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 76f206441a - Show all commits

4
cif/check.go
View File

@ -50,7 +50,7 @@ func CheckCif(cfg *helpers.Configuration) {
log.Info("Full CIF download required")
err := runCifFullDownload(cfg)
if err != nil {
log.Error("Unable to run full CIF Update", zap.Error(err))
log.Error("Full CIF update failed", zap.Error(err))
}
return
}
@ -61,6 +61,6 @@ func CheckCif(cfg *helpers.Configuration) {
log.Info("CIF Update required", zap.Any("days to update", daysToUpdate))
err = runCifUpdateDownload(cfg, metadata, daysToUpdate)
if err != nil {
log.Error("Unable to run CIF update", zap.Error(err))
log.Error("Daily CIF update failed", zap.Error(err))
}
}

12
cif/metadata.go
View File

@ -37,3 +37,15 @@ func isAfterYesterdayAt0600(t time.Time) bool {
yesterday0600 = time.Date(yesterday0600.Year(), yesterday0600.Month(), yesterday0600.Day(), 6, 0, 0, 0, time.UTC)
return t.After(yesterday0600)
}
// Accepts the JsonTimetableV1 struct which contains CIF File metadata and produces a DB Ready struct.
func generateMetadata(header *upstreamApi.JsonTimetableV1) *dbAccess.CifMetadata {
newMetadata := dbAccess.CifMetadata{
Doctype: dbAccess.Doctype,
LastTimestamp: header.Timestamp,
LastUpdate: time.Now().In(londonTimezone),
LastSequence: header.Metadata.Sequence,
}
return &newMetadata
}

2
cif/parse.go
View File

@ -58,7 +58,7 @@ func parseCifDataStream(dataStream io.ReadCloser) (*parsedData, error) {
}
parsed.sched = append(parsed.sched, schedule)
case "EOF":
log.Info("Reached EOF")
log.Debug("Reached EOF")
default:
log.Warn("Unknown CIF Data type", zap.String("key", key))
}

15
cif/process.go
View File

@ -1,8 +1,6 @@
package cif
import (
"time"
"git.fjla.uk/owlboard/go-types/pkg/database"
"git.fjla.uk/owlboard/go-types/pkg/upstreamApi"
"git.fjla.uk/owlboard/timetable-mgr/dbAccess"
@ -100,6 +98,7 @@ func doCreations(creations []*upstreamApi.JsonScheduleV1) error {
document, err := ConvertServiceType(item, false)
if err != nil {
log.Error("Error converting JsonSchedule to Service type", zap.Error(err))
continue
}
createDocuments = append(createDocuments, *document)
@ -113,15 +112,3 @@ func doCreations(creations []*upstreamApi.JsonScheduleV1) error {
return nil
}
// Accepts the JsonTimetableV1 struct which contains CIF File metadata and produces a DB Ready struct.
func generateMetadata(header *upstreamApi.JsonTimetableV1) *dbAccess.CifMetadata {
newMetadata := dbAccess.CifMetadata{
Doctype: dbAccess.Doctype,
LastTimestamp: header.Timestamp,
LastUpdate: time.Now().In(londonTimezone),
LastSequence: header.Metadata.Sequence,
}
return &newMetadata
}

3
dbAccess/cif.go
View File

@ -36,7 +36,6 @@ func GetCifMetadata() (*CifMetadata, error) {
if errors.Is(err, mongo.ErrNoDocuments) {
return nil, nil
}
log.Error("Error fetching CIF Metadata")
return nil, err
}
@ -103,7 +102,6 @@ func DeleteCifEntries(deletions []database.DeleteQuery) error {
_, err := collection.BulkWrite(context.Background(), bulkDeletions, bulkWriteOptions)
if err != nil {
log.Error("Error deleting documents", zap.Error(err))
return err
}
@ -132,7 +130,6 @@ func CreateCifEntries(schedules []database.Service) error {
_, err := collection.BulkWrite(context.Background(), models, bulkWriteOptions)
if err != nil {
log.Error("Error inserting documents", zap.Error(err))
return err
}