Upstream sync

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
 	}