changes on models

controllers/authController.go

@@ -29,7 +29,7 @@ func Login(c *fiber.Ctx) error {
 
 	database.DB.Where("email = ?", data["email"]).First(&user)
 
-	if user.Id == 0 {
+	if user.ID == 0 {
 		return c.JSON(fiber.Map{
 			"message":  "Usuário não encontrado",
 			"userId":   0,
@@ -62,9 +62,9 @@ func Login(c *fiber.Ctx) error {
 	}
 
 	tok := customClaims{
-		Userid: strconv.Itoa(int(user.Id)),
+		Userid: strconv.Itoa(int(user.ID)),
 		StandardClaims: jwt.StandardClaims{
-			Issuer:    strconv.Itoa(int(user.Id)),
+			Issuer:    strconv.Itoa(int(user.ID)),
 			ExpiresAt: time.Now().Add(time.Hour * 1).Unix(),
 		},
 	}
@@ -78,7 +78,7 @@ func Login(c *fiber.Ctx) error {
 
 	return c.JSON(fiber.Map{
 		"message":  "",
-		"userId":   user.Id,
+		"userId":   user.ID,
 		"userType": user.UserType,
 		"userName": user.Name,
 		"token":    token})
@@ -106,14 +106,14 @@ func AddUser(c *fiber.Ctx) error {
 
 	database.DB.Where("email = ?", data["email"]).First(&user)
 
-	if user.Id != 0 {
+	if user.ID != 0 {
 		return c.JSON(fiber.Map{
 			"message": "Usuário já cadastrado"})
 	}
 
 	database.DB.Where("channel = ?", strings.ToLower(data["channel"])).First(&user)
 
-	if user.Id != 0 {
+	if user.ID != 0 {
 		return c.JSON(fiber.Map{
 			"message": "Canal já em uso"})
 	}
@@ -134,7 +134,7 @@ func AddUser(c *fiber.Ctx) error {
 
 	database.DB.Create(&user)
 
-	if user.Id == 0 {
+	if user.ID == 0 {
 		return c.JSON(fiber.Map{
 			"message": "Erro ao criar usuário"})
 	}
@@ -154,7 +154,7 @@ func GetOwnUser(c *fiber.Ctx) error {
 
 	database.DB.Where("id = ?", userCode).First(&user)
 
-	if user.Id == 0 {
+	if user.ID == 0 {
 		return fiber.ErrUnauthorized
 	}
 

controllers/eventController.go

@@ -35,7 +35,7 @@ func AddEvent(c *fiber.Ctx) error {
 
 	user := dbaccess.GetUserById(u)
 
-	if user.Id == 0 {
+	if user.ID == 0 {
 		return fiber.ErrBadRequest
 	}
 
@@ -56,14 +56,14 @@ func AddEvent(c *fiber.Ctx) error {
 	event := models.Event{
 		Name:         data["name"],
 		Description:  data["description"],
-		UserId:       user.Id,
+		UserId:       user.ID,
 		ExpectedDate: startdt,
 		EventType:    data["eventtype"],
 	}
 
 	database.DB.Create(&event)
 
-	if event.Id == 0 {
+	if event.ID == 0 {
 		return fiber.ErrNotAcceptable
 	}
 
@@ -102,11 +102,11 @@ func GetEventsByUser(c *fiber.Ctx) error {
 
 	database.DB.Where("id = ?", c.Params("id")).First(&user)
 
-	if user.Id == 0 {
+	if user.ID == 0 {
 		return fiber.ErrUnauthorized
 	}
 
-	database.DB.Where("user_id = ?", user.Id).Find(&events)
+	database.DB.Where("user_id = ?", user.ID).Find(&events)
 
 	if len(events) == 0 {
 		return fiber.ErrNotFound

controllers/serverController.go

@@ -28,7 +28,7 @@ func AddServer(c *fiber.Ctx) error {
 
 	database.DB.Create(&server)
 
-	if server.Id == 0 {
+	if server.ID == 0 {
 		return fiber.ErrNotAcceptable
 	}
 

database/database.go

@@ -66,8 +66,9 @@ func ConnectDB() error {
 
 	if len(servers) == 0 {
 		server := models.Server{
-			Name: "Pcast Main Server",
+			Name:      "Pcast Main Server",
-			IP:   "177.153.50.98",
+			Subdomain: "s1",
+			IP:        "177.153.50.98",
 		}
 
 		db.Create(&server)
@@ -93,6 +94,7 @@ func ConnectDB() error {
 			Blocked:     "N",
 			Cancelled:   "N",
 			CreatedBy:   "Auto",
+			ServerId:    1,
 		}
 
 		db.Create(&user)

models/events.go

@@ -1,9 +1,13 @@
 package models
 
-import "time"
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
 
 type Event struct {
-	Id           uint      `gorm:"primary key" json:"id"`
+	gorm.Model
 	Name         string    `gorm:"size:40;not null" json:"name"`
 	Description  string    `gorm:"not null" json:"description"`
 	ExpectedDate time.Time `gorm:"not null" json:"startDt"`

models/servers.go

@@ -1,7 +1,12 @@
 package models
 
+import (
+	"gorm.io/gorm"
+)
+
 type Server struct {
-	Id   uint   `gorm:"primary key" json:"id"`
+	gorm.Model
-	Name string `gorm:"size:40;not null" json:"name"`
+	Name      string `gorm:"size:40;not null" json:"name"`
-	IP   string `gorm:"size:40;not null" json:"ip"`
+	Subdomain string `gorm:"size:40;not null" json:"subdomain"`
+	IP        string `gorm:"size:40;not null" json:"ip"`
 }

models/users.go

@@ -1,7 +1,11 @@
 package models
 
+import (
+	"gorm.io/gorm"
+)
+
 type User struct {
-	Id          uint   `gorm:"primary key" json:"id"`
+	gorm.Model
 	Name        string `gorm:"size:40;not null" json:"name"`
 	CompanyName string `gorm:"size:40;not null" json:"companyname"`
 	Email       string `gorm:"size:40;not null;unique" json:"email"`
@@ -10,8 +14,22 @@ type User struct {
 	Url         string `gorm:"size:40;not null" json:"url"`
 	CpfCnpj     string `gorm:"size:20;not null" json:"cpfcnpj"`
 	UserType    string `gorm:"size:1;not null;default:U" json:"usertype"`
-	Plan        string `gorm:"size:1;not null;default:1" json:"T"`
+	Plan        string `gorm:"size:1;not null;default:A" json:"plan"`
 	Blocked     string `gorm:"size:1;not null;default:N" json:"blocked"`
 	Cancelled   string `gorm:"size:1;not null;default:N" json:"cancelled"`
 	CreatedBy   string `gorm:"size:15;not null;default:Manual" json:"createdby"`
+	ServerId    uint   `gorm:"not null" json:"serverid"`
 }
+
+// Plan:
+
+// A - Admin
+// T - Trial
+// FM - Fácil Mensal
+// FT - Fácil Trimestral
+// FS - Fácil Semestral
+// FA - Fácil Anual
+// FM - Fácil Plus Mensal
+// FT - Fácil Plus Trimestral
+// FS - Fácil Plus Semestral
+// FA - Fácil Plus Anual