Upstream sync

controllers/auth_controller.go

@@ -13,16 +13,15 @@ import (
 
 type AuthController struct{}
 
-
-func (AuthController)HandleLogin(c *gin.Context) {
-	userId:="123"
-	username:="Beast"
-	roles:= []string{shared.RoleAdmin, shared.RoleProUser}
+func (AuthController) HandleLogin(c *gin.Context) {
+	userId := "123"
+	username := "Beast"
+	roles := []string{shared.RoleAdmin, shared.RoleProUser}
 
 	// do user auth here
 
 	//issue token
-	token, err := middlewares.GenerateToken([]byte(middlewares.SigningKey), userId,username, roles)
+	token, err := middlewares.GenerateToken([]byte(middlewares.SigningKey), userId, username, roles)
 	if err != nil {
 		log.Printf("Unable to generate token %v", err)
 		c.JSON(http.StatusInternalServerError, err)

controllers/devices_controller.go

@@ -20,42 +20,40 @@ func SaveDeviceInfofunc(c *gin.Context) {
 	err := json.Unmarshal(rawData, &deviceInfo)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid JSON payload"})
-		log.Printf("Invalid json pyload : %v",err)
+		log.Printf("Invalid json pyload : %v", err)
 		return
 	}
-	
 
 	deviceInfo.RawJSON = string(rawData)
 
-		// Attempt to find the device by IMEI; if not found, create a new device
-		var device models.Device
-		if err := shared.GetDb().Where("imei = ?", deviceInfo.IMEI).First(&device).Error; err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				// Create new device
-				newDevice := models.Device{
-					IMEI: deviceInfo.IMEI,
-					IMSI: deviceInfo.IMSI,
-					DeviceConfiguration: string(rawData),
-				}
-				if err := shared.GetDb().Create(&newDevice).Error; err != nil {
-					log.Printf("CREATE -Device DB Error: %v",err)
-					c.JSON(http.StatusInternalServerError, gin.H{"error": "Could not create new device"})
-					return
-				}
-				deviceInfo.DeviceID = newDevice.ID
-			} else {
-				log.Printf("CREATE -Device DB Error: %v",err)
-				c.JSON(http.StatusInternalServerError, gin.H{"error": "Database error"})
+	// Attempt to find the device by IMEI; if not found, create a new device
+	var device models.Device
+	if err := shared.GetDb().Where("imei = ?", deviceInfo.IMEI).First(&device).Error; err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			// Create new device
+			newDevice := models.Device{
+				IMEI:                deviceInfo.IMEI,
+				IMSI:                deviceInfo.IMSI,
+				DeviceConfiguration: string(rawData),
+			}
+			if err := shared.GetDb().Create(&newDevice).Error; err != nil {
+				log.Printf("CREATE -Device DB Error: %v", err)
+				c.JSON(http.StatusInternalServerError, gin.H{"error": "Could not create new device"})
 				return
 			}
+			deviceInfo.DeviceID = newDevice.ID
 		} else {
-			deviceInfo.DeviceID = device.ID
+			log.Printf("CREATE -Device DB Error: %v", err)
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "Database error"})
+			return
 		}
-
+	} else {
+		deviceInfo.DeviceID = device.ID
+	}
 
 	// Save deviceInfo to your database
 	if err := shared.GetDb().Create(&deviceInfo).Error; err != nil {
-		log.Printf("SaveDeviceInfo CREATE -DeviceInfo DB Error: %v",err)
+		log.Printf("SaveDeviceInfo CREATE -DeviceInfo DB Error: %v", err)
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Could not save device info"})
 		return
 	}

controllers/devices_controller_test.go

@@ -26,7 +26,7 @@ func runTestServer() *httptest.Server {
 	if err != nil {
 		log.Fatal(err)
 	}
-	
+
 	shared.Init()
 	r := gin.Default()
 	r.POST("/device_info", SaveDeviceInfofunc)
@@ -45,7 +45,6 @@ func TestSaveDeviceInfofunc(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Expected no error, got %v", err)
 		}
-		
 
 		assert.Equal(t, 400, resp.StatusCode)
 	})
@@ -65,7 +64,7 @@ func TestSaveDeviceInfofunc(t *testing.T) {
 	t.Run("it should return 200 when all conditions are correct", func(t *testing.T) {
 		// Add a valid payload
 		deviceInfo := map[string]interface{}{
-			"IMEI":          "SOME_VALID_IMEI",
+			"IMEI":           "SOME_VALID_IMEI",
 			"SomeOtherField": "Value",
 		}
 

controllers/simple_controller.go

@@ -6,10 +6,10 @@ package controllers
 
 import "github.com/gin-gonic/gin"
 
-func GetSecretText(c *gin.Context){
+func GetSecretText(c *gin.Context) {
 	c.JSON(200, "Hi this is a secret message. Auth was successful!")
 }
 
-func GetPublicText(c *gin.Context){
+func GetPublicText(c *gin.Context) {
 	c.JSON(200, "Hi this is a public message!")
 }