fixed formatting alignment

chrisdedman · chrisdedman · commit 764032065678 · 2024-11-13T20:23:52.000-08:00
diff --git a/backend/internal/entity/account.go b/backend/internal/entity/account.go
@@ -4,9 +4,9 @@ import "gorm.io/gorm"
 
 type Account struct {
 	gorm.Model
-	Username string `gorm:"size:255;not null;" json:"username"`
-	Password string `gorm:"size:255;not null;" json:"-"`
-	Email    string `gorm:"size:100;not null;unique" json:"email"`
-	Role     string `gorm:"size:10;not null;check:role IN ('student', 'educator');" json:"role"`
-	Courses []*Course `gorm:"many2many:enrollment;"`
+	Username string    `gorm:"size:255;not null;" json:"username"`
+	Password string    `gorm:"size:255;not null;" json:"-"`
+	Email    string    `gorm:"size:100;not null;unique" json:"email"`
+	Role     string    `gorm:"size:10;not null;check:role IN ('student', 'educator');" json:"role"`
+	Courses  []*Course `gorm:"many2many:enrollment;"`
 }
diff --git a/backend/internal/entity/content.go b/backend/internal/entity/content.go
@@ -4,8 +4,8 @@ import "gorm.io/gorm"
 
 type Content struct {
 	gorm.Model
-	Title string `gorm:"size:255;not null;" json:"title"`
-	Path string `gorm:"size:255;not null;" json:"path"`
-	ModuleID uint 
-	Module Module `gorm:"foreignKey:ModuleID;references:ID" json:"-"`
+	Title    string `gorm:"size:255;not null;" json:"title"`
+	Path     string `gorm:"size:255;not null;" json:"path"`
+	ModuleID uint
+	Module   Module `gorm:"foreignKey:ModuleID;references:ID" json:"-"`
 }
diff --git a/backend/internal/entity/course.go b/backend/internal/entity/course.go
@@ -4,10 +4,10 @@ import "gorm.io/gorm"
 
 type Course struct {
 	gorm.Model
-	Title string `gorm:"size:255;not null;" json:"title"`
-	Description string `gorm:"size:255;not null;" json:"description"`
-	CreatorID int `gorm:"foreignKey" json:"creator_id"`
-	Students []Account `gorm:"many2many:enrollment;" json:"students"`
-	Tags []Tag `gorm:"many2many:course_tag;" json:"tags"`
-	Modules []Module `json:"modules"`
+	Title       string    `gorm:"size:255;not null;" json:"title"`
+	Description string    `gorm:"size:255;not null;" json:"description"`
+	CreatorID   int       `gorm:"foreignKey" json:"creator_id"`
+	Students    []Account `gorm:"many2many:enrollment;" json:"students"`
+	Tags        []Tag     `gorm:"many2many:course_tag;" json:"tags"`
+	Modules     []Module  `json:"modules"`
 }
diff --git a/backend/internal/entity/module.go b/backend/internal/entity/module.go
@@ -4,8 +4,8 @@ import "gorm.io/gorm"
 
 type Module struct {
 	gorm.Model
-	Title string `gorm:"size:255;not null;" json:"title"`
-	CourseID uint 
-	Course Course `gorm:"foreignKey:CourseID;references:ID" json:"-"`
-	Content []Content `json:"content"`
+	Title    string `gorm:"size:255;not null;" json:"title"`
+	CourseID uint
+	Course   Course    `gorm:"foreignKey:CourseID;references:ID" json:"-"`
+	Content  []Content `json:"content"`
 }
diff --git a/backend/internal/entity/tag.go b/backend/internal/entity/tag.go
@@ -4,6 +4,6 @@ import "gorm.io/gorm"
 
 type Tag struct {
 	gorm.Model
-	TagName string `gorm:"size:255;not null;" json:"tag_name)"`
+	TagName string   `gorm:"size:255;not null;" json:"tag_name)"`
 	Courses []Course `gorm:"many2many:course_tag;"`
 }
diff --git a/backend/internal/handlers/courses.go b/backend/internal/handlers/courses.go
@@ -11,22 +11,21 @@ import (
 
 // Courses function retrieves enrolled course titles and descriptions based on user_id from the URL
 func Courses(c *fiber.Ctx) error {
-	
 	user_id := c.Params("user_id")
 
 	var user entity.Account
 	// Check if the user exists
 	if err := database.DB.Where("id = ?", user_id).First(&user).Error; err != nil {
 		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "User not found"})
 	}
-	
+
 	var courses []entity.Course
 	// Get all courses that user is enrolled in
 	if err := database.DB.Model(&entity.Course{}).Where("id IN (?)", database.DB.Table("enrollment").Select("course_id").Where("account_id = ?", user_id)).Find(&courses).Error; err != nil {
 		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "Error retrieving courses"})
 	}
 
-	if len(courses) == 0{
+	if len(courses) == 0 {
 		return c.JSON(fiber.Map{
 			"message": "Not enrolled in any courses",
 			"courses": courses,
@@ -37,12 +36,10 @@ func Courses(c *fiber.Ctx) error {
 		"message": "Courses successfully retrieved",
 		"courses": courses,
 	})
-
 }
 
 // Course function retrieves an indiviudal course from its id
 func Course(c *fiber.Ctx) error {
-	
 	course_id := c.Params("course_id")
 
 	var course entity.Course
@@ -53,14 +50,12 @@ func Course(c *fiber.Ctx) error {
 
 	return c.JSON(fiber.Map{
 		"message": "Course successfully retrieved",
-		"course": course,
+		"course":  course,
 	})
-
 }
 
 // Modules function retrieves the modules of a course
 func Modules(c *fiber.Ctx) error {
-	
 	course_id := c.Params("course_id")
 
 	var modules []entity.Module
@@ -69,7 +64,7 @@ func Modules(c *fiber.Ctx) error {
 		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "Course not found"})
 	}
 
-	if len(modules) == 0{
+	if len(modules) == 0 {
 		return c.JSON(fiber.Map{
 			"message": "No modules in course",
 			"modules": modules,
@@ -80,63 +75,60 @@ func Modules(c *fiber.Ctx) error {
 		"message": "Modules successfully retrieved",
 		"modules": modules,
 	})
-
 }
 
 // Content function retrieves the content of a module
 func Content(c *fiber.Ctx) error {
-	
 	module_id := c.Params("module_id")
 
 	var module entity.Module
 	// Check if the module exists
 	if err := database.DB.Preload("Content").Where("id = ?", module_id).First(&module).Error; err != nil {
 		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "Module not found"})
 	}
-	
+
 	var content = module.Content
 
-	if len(content) == 0{
+	if len(content) == 0 {
 		return c.JSON(fiber.Map{
 			"message": "No content in module",
-			"content": [] string{},
+			"content": []string{},
 		})
 	}
 
 	return c.JSON(fiber.Map{
 		"message": "Content successfully retrieved",
 		"content": content,
 	})
-
 }
 
 // CreateCourse creates a course and adds it to the database.
 func CreateCourse(c *fiber.Ctx) error {
-	
-	creator_id,err := strconv.Atoi(c.Params("creator_id"))
-	if err != nil{
+	creator_id, err := strconv.Atoi(c.Params("creator_id"))
+	if err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid creator_id"})
 	}
 
-	var data map[string]string;
+	var data map[string]string
 	if err := c.BodyParser(&data); err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid input"})
 	}
 
 	//Verify that the account attempting to create a course is an educator
-	var role string;
+	var role string
 	if err := database.DB.Model(&entity.Account{}).Select("role").Where("id = ?", creator_id).First(&role).Error; err != nil {
 		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "User not found"})
 	}
-	if role != "educator"{
+
+	if role != "educator" {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "User is not an educator"})
 	}
 
 	// Create course
 	course := entity.Course{
-		Title: data["title"],
+		Title:       data["title"],
 		Description: data["description"],
-		CreatorID: creator_id,
+		CreatorID:   creator_id,
 	}
 
 	// Add course to database
@@ -146,22 +138,21 @@ func CreateCourse(c *fiber.Ctx) error {
 
 	return c.JSON(fiber.Map{
 		"message": "Course created successfully",
-		"course":    course,
+		"course":  course,
 	})
 }
 
 // Enroll user into course
 func Enroll(c *fiber.Ctx) error {
-	
 	user_id := c.Params("user_id")
 	course_id := c.Params("course_id")
-	
+
 	var user entity.Account
 	// Check if the user exists
 	if err := database.DB.Where("id = ?", user_id).First(&user).Error; err != nil {
 		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "User not found"})
 	}
-	
+
 	var course entity.Course
 	// Check if the course exists
 	if err := database.DB.Where("id = ?", course_id).First(&course).Error; err != nil {
@@ -176,23 +167,21 @@ func Enroll(c *fiber.Ctx) error {
 	return c.JSON(fiber.Map{
 		"message": fmt.Sprintf("Successfully enrolled user id %d in course %s", user.ID, course.Title),
 	})
-
 }
 
 // Create a module inside a course
 func CreateModule(c *fiber.Ctx) error {
-	
-	creator_id,err := strconv.Atoi(c.Params("creator_id"))
-	if err != nil{
+	creator_id, err := strconv.Atoi(c.Params("creator_id"))
+	if err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid creator_id"})
 	}
 
-	course_id,err := strconv.Atoi(c.Params("course_id"))
-	if err != nil{
+	course_id, err := strconv.Atoi(c.Params("course_id"))
+	if err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid course_id"})
 	}
 
-	var data map[string]string;
+	var data map[string]string
 	if err := c.BodyParser(&data); err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid input"})
 	}
@@ -202,14 +191,15 @@ func CreateModule(c *fiber.Ctx) error {
 	if err := database.DB.Where("id = ?", course_id).First(&course).Error; err != nil {
 		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "Course not found"})
 	}
+
 	//Verify that the account attempting to create a module is the creator of the course
-	if course.CreatorID != creator_id{
+	if course.CreatorID != creator_id {
 		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "User is not the course creator"})
 	}
 
 	// Create module
 	module := entity.Module{
-		Title: data["title"],
+		Title:  data["title"],
 		Course: course,
 	}
 
@@ -220,24 +210,23 @@ func CreateModule(c *fiber.Ctx) error {
 
 	return c.JSON(fiber.Map{
 		"message": "Module created successfully",
-		"module":    module,
+		"module":  module,
 	})
 }
 
 // Create content inside a module
 func CreateContent(c *fiber.Ctx) error {
-	
-	creator_id,err := strconv.Atoi(c.Params("creator_id"))
-	if err != nil{
+	creator_id, err := strconv.Atoi(c.Params("creator_id"))
+	if err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid creator_id"})
 	}
 
-	module_id,err := strconv.Atoi(c.Params("module_id"))
-	if err != nil{
+	module_id, err := strconv.Atoi(c.Params("module_id"))
+	if err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid module_id"})
 	}
 
-	var data map[string]string;
+	var data map[string]string
 	if err := c.BodyParser(&data); err != nil {
 		return c.Status(fiber.StatusBadRequest).JSON(fiber.Map{"error": "Invalid input"})
 	}
@@ -247,16 +236,18 @@ func CreateContent(c *fiber.Ctx) error {
 	if err := database.DB.Preload("Course").Where("id = ?", module_id).First(&module).Error; err != nil {
 		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "Module not found"})
 	}
+
 	//Verify that the account attempting to create content is the creator of the course
-	if module.Course.CreatorID != creator_id{
+	if module.Course.CreatorID != creator_id {
 		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{"error": "User is not the course creator"})
 	}
 
 	// Create content
 	content := entity.Content{
-		Title: data["title"],
+		Title:  data["title"],
 		Module: module,
 	}
+
 	content.Path = fmt.Sprintf("content/%d/%d", module.Course.ID, content.ID)
 
 	// Add content to database
@@ -266,6 +257,6 @@ func CreateContent(c *fiber.Ctx) error {
 
 	return c.JSON(fiber.Map{
 		"message": "Content created successfully",
-		"content":    content,
+		"content": content,
 	})
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ import "gorm.io/gorm"`
`4`	`4`
`5`	`5`	`type Tag struct {`
`6`	`6`	`gorm.Model`
`7`		- TagName string `gorm:"size:255;not null;" json:"tag_name)"`
	`7`	+ TagName string `gorm:"size:255;not null;" json:"tag_name)"`
`8`	`8`	Courses []Course `gorm:"many2many:course_tag;"`
`9`	`9`	`}`