Encapsulate default term selection into term.go

This commit is contained in:
2024-01-29 05:28:50 -06:00
parent c5ad772ebc
commit 281944546f
2 changed files with 12 additions and 9 deletions

12
main.go
View File

@@ -270,15 +270,9 @@ func main() {
} }
// Term Select Pre-Search POST // Term Select Pre-Search POST
var termSelect string term := Default(time.Now()).ToString()
currentTerm, nextTerm := GetCurrentTerm(time.Now()) log.Info().Str("term", term).Str("sessionID", sessionID).Msg("Setting selected term")
if currentTerm == nil { SelectTerm(term)
termSelect = nextTerm.ToString()
} else {
termSelect = currentTerm.ToString()
}
log.Info().Str("term", termSelect).Str("sessionID", sessionID).Msg("Setting selected term")
SelectTerm(termSelect)
// Close session, ensure http client closes idle connections // Close session, ensure http client closes idle connections
defer session.Close() defer session.Close()

View File

@@ -129,3 +129,12 @@ func (term Term) ToString() string {
return fmt.Sprintf("%d%s", term.Year, season) return fmt.Sprintf("%d%s", term.Year, season)
} }
// Default chooses the default term, which is the current term if it exists, otherwise the next term.
func Default(t time.Time) Term {
currentTerm, nextTerm := GetCurrentTerm(t)
if currentTerm == nil {
return *nextTerm
}
return *currentTerm
}