1.0.3 - Updated users and events table structure

controllers/authController.go

@@ -15,7 +15,7 @@ import (
 
 func Version(c *fiber.Ctx) error {
 	return c.JSON(fiber.Map{
-		"version": "1.0.2",
+		"version": "1.0.3",
 	})
 }
 
@@ -78,12 +78,20 @@ func AddUser(c *fiber.Ctx) error {
 		return err
 	}
 
+	if data["name"] == "" || data["email"] == "" || data["password"] == "" || data["channel"] == "" {
+		c.SendStatus(fiber.StatusBadRequest)
+		return c.JSON(fiber.Map{
+			"message": "Nome, E-Mail, Senha e Nome do Canal devem ser informados",
+		})
+	}
+
 	passwd, _ := utils.HashPassword(data["password"])
 
 	user := models.User{
 		Name:      data["name"],
 		Email:     data["email"],
 		Password:  passwd,
+		Channel:   data["channel"],
 		UserType:  data["usertype"],
 		Blocked:   "N",
 		Cancelled: "N",
@@ -141,9 +149,9 @@ func GetAllUsers(c *fiber.Ctx) error {
 	database.DB.Find(&users)
 
 	if len(users) == 0 {
-		c.Status(fiber.StatusUnauthorized)
+		c.Status(fiber.StatusNotFound)
 		return c.JSON(fiber.Map{
-			"message": "Sem autorização",
+			"message": "Nenhum usuário encontrado",
 		})
 	}
 

controllers/eventController.go

@@ -13,7 +13,6 @@ import (
 
 func AddEvent(c *fiber.Ctx) error {
 	var data map[string]string
-	var audience int
 	var startdt time.Time
 
 	_, err := utils.ProcessToken(c)
@@ -45,21 +44,6 @@ func AddEvent(c *fiber.Ctx) error {
 		})
 	}
 
-	if data["audience"] == "" {
-		c.Status(fiber.StatusBadRequest)
-		return c.JSON(fiber.Map{
-			"message": "Audience not defined",
-		})
-	} else {
-		audience, err = strconv.Atoi(data["audience"])
-		if err != nil {
-			c.Status(fiber.StatusBadRequest)
-			return c.JSON(fiber.Map{
-				"message": "Invalid value for audience",
-			})
-		}
-	}
-
 	dateformat := "02/01/2006 15:04"
 	if data["startDt"] == "" {
 		c.Status(fiber.StatusBadRequest)
@@ -80,7 +64,6 @@ func AddEvent(c *fiber.Ctx) error {
 		Name:         data["name"],
 		UserId:       user.Id,
 		User:         user,
-		ExpectedAudience: audience,
 		ExpectedDate: startdt,
 		EventType:    data["eventtype"],
 	}

database/database.go

@@ -16,7 +16,7 @@ import (
 // Our database
 var DB *gorm.DB
 
-// NewDatabase - returns a pointer to a new database connection
+// ConnectDB - returns a pointer to a new database connection
 func ConnectDB() error {
 	var erre error
 
@@ -39,8 +39,10 @@ func ConnectDB() error {
 		return err
 	}
 
+	log.Println("Migrating database tables")
+
 	if result := db.AutoMigrate(&models.User{}); result != nil {
-		return err
+		return result
 	}
 
 	if result := db.AutoMigrate(&models.Event{}); result != nil {

models/events.go

@@ -6,9 +6,8 @@ type Event struct {
 	Id           uint      `gorm:"primary key" json:"id"`
 	Name         string    `gorm:"size:40;not null" json:"name"`
 	Description  string    `gorm:"not null" json:"description"`
-	ExpectedAudience int       `gorm:"size:40;not null" json:"audience"`
 	ExpectedDate time.Time `gorm:"not null" json:"startDt"`
 	UserId       uint      `gorm:"size:40;not null" json:"user"`
 	User         User
-	EventType        string `gorm:"size:1;not null;default:U" json:"eventtype"`
+	EventType    string `gorm:"size:1;not null;default:O" json:"eventtype"` // O = Open, C = Closed
 }

models/users.go

@@ -5,6 +5,7 @@ type User struct {
 	Name      string `gorm:"size:40;not null" json:"name"`
 	Email     string `gorm:"size:40;not null;unique" json:"email"`
 	Password  []byte `gorm:"size:100;not null;" json:"-"`
+	Channel   string `gorm:"size:40;not null" json:"channel"`
 	UserType  string `gorm:"size:1;not null;default:U" json:"usertype"`
 	Blocked   string `gorm:"size:1;not null;default:N" json:"blocked"`
 	Cancelled string `gorm:"size:1;not null;default:N" json:"cancelled"`

routes/routes.go

@@ -14,6 +14,7 @@ func Setup(app *fiber.App) {
 	app.Get("/version", controllers.Version)
 
 	app.Post("/login", controllers.Login)
+	app.Post("/register", controllers.AddUser)
 
 	protected := app.Group("/")
 	protected.Use(jwtware.New(jwtware.Config{