Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions internal/firebase/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,27 @@ func (c *Firestore) QueryBySchool(ctx context.Context, term, school string, limi
return c.collectCourses(ctx, query, limit, offset)
}

func (c *Firestore) GetCourseBySection(ctx context.Context, term string, prefix string, number string, section string) (*types.Course, error) {
term = normalizeTerm(term)
prefix = normalizeCoursePrefix(prefix)
number = normalizeCourseNumber(number)
section = strings.ToLower(strings.TrimSpace(section))

id := fmt.Sprintf("%s%s.%s.%s", prefix, number, section, term)

doc, err := c.Collection("courses").Doc(prefix).Collection("numbers").Doc(number).Collection("sections").Doc(id).Get(ctx)
if err != nil {
return nil, err
}

var course types.Course
if err := doc.DataTo(&course); err != nil {
return nil, err
}

return &course, nil
}

func (c *Firestore) collectCourses(ctx context.Context, query firestore.Query, limit, offset int) ([]types.Course, bool, error) {
if limit > 0 {
query = query.Offset(offset).Limit(limit + 1)
Expand Down
37 changes: 25 additions & 12 deletions internal/server/handlers/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (h *Handler) GetAllCourses(c *gin.Context) {
})
}

// GetCoursesByTerm fetches courses and applies optional prefix/number filters.
// GetCoursesByTerm fetches courses within a term.
func (h *Handler) GetCoursesByTerm(c *gin.Context) {
term := normalizeTerm(c.Param("term"))
if term == "" {
Expand All @@ -59,23 +59,13 @@ func (h *Handler) GetCoursesByTerm(c *gin.Context) {
return
}

prefix := normalizePrefix(c.Query("prefix"))
number := normalizeCourseNumber(c.Query("number"))

var (
courses []types.Course
hasNext bool
err error
)

switch {
case prefix != "" && number != "":
courses, hasNext, err = h.db.QueryByCourseNumber(c.Request.Context(), term, prefix, number, params.Limit, params.Offset)
case prefix != "":
courses, hasNext, err = h.db.QueryByCoursePrefix(c.Request.Context(), term, prefix, params.Limit, params.Offset)
default:
courses, hasNext, err = h.db.GetAllCoursesByTerm(c.Request.Context(), term, params.Limit, params.Offset)
}
courses, hasNext, err = h.db.GetAllCoursesByTerm(c.Request.Context(), term, params.Limit, params.Offset)

if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
Expand Down Expand Up @@ -158,6 +148,29 @@ func (h *Handler) GetCoursesByNumber(c *gin.Context) {
})
}

// GetCourseBySection fetches a specific course by term, prefix, number, and section.
func (h *Handler) GetCourseBySection(c *gin.Context) {
term := normalizeTerm(c.Param("term"))
prefix := normalizePrefix(c.Param("prefix"))
number := normalizeCourseNumber(c.Param("number"))
section := strings.TrimSpace(c.Param("section"))

if term == "" || prefix == "" || number == "" || section == "" {
c.JSON(http.StatusBadRequest, gin.H{"error": "Term, prefix, number, and section parameters are required"})
return
}

course, err := h.db.GetCourseBySection(c.Request.Context(), term, prefix, number, section)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}

c.JSON(http.StatusOK, gin.H{
"course": course,
})
}

// SearchCourses runs a text search against courses for a term.
func (h *Handler) SearchCourses(c *gin.Context) {
term := normalizeTerm(c.Param("term"))
Expand Down
1 change: 1 addition & 0 deletions internal/server/router/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func New(handler *handlers.Handler, mw *middleware.Manager) http.Handler {
courses.GET("/:term", handler.GetCoursesByTerm)
courses.GET("/:term/prefix/:prefix", handler.GetCoursesByPrefix)
courses.GET("/:term/prefix/:prefix/number/:number", handler.GetCoursesByNumber)
courses.GET("/:term/prefix/:prefix/number/:number/section/:section", handler.GetCourseBySection)
courses.GET("/:term/search", handler.SearchCourses)
}

Expand Down