Merge from develop

Author: mikehquan19

api/controllers/controller_utils.go

@@ -29,12 +29,12 @@ func respond[T any](c *gin.Context, status int, message string, data T) {
 func getQuery[T any](flag string, c *gin.Context) (bson.M, error) {
 	switch flag {
 	case "Search":
-		q, err := schema.FilterQuery[T](c)
+		query, err := schema.FilterQuery[T](c)
 		if err != nil {
 			respond(c, http.StatusBadRequest, "Invalid query parameters", err.Error())
 			return nil, err
 		}
-		return q, nil
+		return query, nil
 
 	case "ById":
 		objId, err := objectIDFromParam(c, "id")

api/controllers/course.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	"errors"
 	"net/http"
 	"time"
 
@@ -100,7 +101,11 @@ func CourseById(c *gin.Context) {
 	// find and parse matching course
 	err = courseCollection.FindOne(ctx, query).Decode(&course)
 	if err != nil {
-		respondWithInternalError(c, err)
+		if errors.Is(err, mongo.ErrNoDocuments) {
+			respond(c, http.StatusNotFound, "error", "No courses with given ID")
+		} else {
+			respondWithInternalError(c, err)
+		}
 		return
 	}
 

api/controllers/events.go

@@ -93,11 +93,7 @@ func EventsByBuilding(c *gin.Context) {
 
 	// If no building is found, return an error
 	if eventsByBuilding.Building == "" {
-		c.JSON(http.StatusNotFound, schema.APIResponse[string]{
-			Status:  http.StatusNotFound,
-			Message: "error",
-			Data:    "No events found for the specified building",
-		})
+		respond(c, http.StatusNotFound, "error", "No events found for the specified building")
 		return
 	}
 
@@ -152,11 +148,7 @@ func EventsByRoom(c *gin.Context) {
 	}
 
 	if eventsByRoom.Room == "" {
-		c.JSON(http.StatusNotFound, schema.APIResponse[string]{
-			Status:  http.StatusNotFound,
-			Message: "error",
-			Data:    "No events found for the specified building and room",
-		})
+		respond(c, http.StatusNotFound, "error", "No events found for the specified building and room")
 		return
 	}
 
@@ -237,11 +229,7 @@ func SectionsByRoomDetailed(c *gin.Context) {
 	}
 
 	if len(sectionsByRoom.Events) == 0 {
-		c.JSON(http.StatusNotFound, schema.APIResponse[string]{
-			Status:  http.StatusNotFound,
-			Message: "error",
-			Data:    "No section details found",
-		})
+		respond(c, http.StatusNotFound, "error", "No section details found")
 		return
 	}
 

api/controllers/professor.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	"errors"
 	"net/http"
 	"time"
 
@@ -108,7 +109,11 @@ func ProfessorById(c *gin.Context) {
 	// find and parse matching professor
 	err = professorCollection.FindOne(ctx, query).Decode(&professor)
 	if err != nil {
-		respondWithInternalError(c, err)
+		if errors.Is(err, mongo.ErrNoDocuments) {
+			respond(c, http.StatusNotFound, "error", "No professors with given ID")
+		} else {
+			respondWithInternalError(c, err)
+		}
 		return
 	}
 

api/controllers/section.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	"errors"
 	"net/http"
 	"time"
 
@@ -109,7 +110,11 @@ func SectionById(c *gin.Context) {
 	// find and parse matching section
 	err = sectionCollection.FindOne(ctx, query).Decode(&section)
 	if err != nil {
-		respondWithInternalError(c, err)
+		if errors.Is(err, mongo.ErrNoDocuments) {
+			respond(c, http.StatusNotFound, "error", "No sections with given ID")
+		} else {
+			respondWithInternalError(c, err)
+		}
 		return
 	}
 

api/controllers/storage.go

@@ -168,7 +168,11 @@ func ObjectInfo(c *gin.Context) {
 	// Get object attributes
 	attrs, err := objectHandle.Attrs(ctx)
 	if err != nil {
-		respondWithInternalError(c, err)
+		if errors.Is(err, storage.ErrObjectNotExist) {
+			respond(c, http.StatusNotFound, "error", "Object with given ID not found")
+		} else {
+			respondWithInternalError(c, err)
+		}
 		return
 	}