Fix499 correct sizeu value

API/models/entity_attributes.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"math"
 	"p3/repository"
 	u "p3/utils"
 	"strings"
@@ -156,7 +157,7 @@ func setCorridorColor(attributes map[string]any) {
 	}
 }
 
-// Check if sizeU and height are coherents
+// Check if sizeU and height are consistent
 func checkSizeUAndHeight(attributes map[string]any) *u.Error {
 	if attributes["sizeU"] == nil || attributes["height"] == nil {
 		return nil
@@ -169,15 +170,22 @@ func checkSizeUAndHeight(attributes map[string]any) *u.Error {
 			Message: err.Error(),
 		}
 	}
-	height := attributes["height"]
-	h := sizeU * RACKUNIT
+	height, err := u.GetFloat(attributes["height"])
+	if err != nil {
+		return &u.Error{
+			Type:    u.ErrBadFormat,
+			Message: err.Error(),
+		}
+	}
+
+	s := height / RACKUNIT
 	switch heightUnit := attributes["heightUnit"]; heightUnit {
 	case "cm":
-		h *= 100
+		s /= 100
 	case "mm":
-		h *= 1000
+		s /= 1000
 	}
-	if height == h {
+	if sizeU == math.Ceil(s) {
 		return nil
 	} else {
 		return &u.Error{

API/models/schemas/device_schema.json

@@ -44,7 +44,7 @@
             "$ref": "refs/types.json#/definitions/float"
           },
           "sizeU": {
-            "$ref": "refs/types.json#/definitions/float"
+            "type": "integer"
           },
           "color": {
             "type": "string",

CLI/controllers/create_test.go

@@ -5,6 +5,7 @@ import (
 	l "cli/logger"
 	"cli/models"
 	test_utils "cli/test"
+	"cli/utils"
 	"maps"
 	"testing"
 
@@ -460,8 +461,8 @@ func TestCreateDeviceWithSizeU(t *testing.T) {
 	controller, mockAPI, _ := layersSetup(t)
 
 	mockGetResponse := test_utils.GetEntity("rack", "A01", "BASIC.A.R1", "test-domain")
-	sizeU := float64(2)
-	height := sizeU * models.RACKUNIT * 1000
+	sizeU := 2
+	height := utils.RoundFloat(float64(sizeU)*models.RACKUNIT*1000, 3)
 	mockCreateResponse := map[string]any{
 		"category":    "device",
 		"id":          "BASIC.A.R1.A01.D1",
@@ -472,7 +473,7 @@ func TestCreateDeviceWithSizeU(t *testing.T) {
 		"attributes": map[string]any{
 			"height":      height,
 			"sizeU":       sizeU,
-			"heightUnit":  "U",
+			"heightUnit":  "mm",
 			"orientation": "front",
 			"size":        []float64{1, 1},
 			"sizeUnit":    "cm",
@@ -489,7 +490,7 @@ func TestCreateDeviceWithSizeU(t *testing.T) {
 		"domain":   "test-domain",
 		"attributes": map[string]any{
 			"sizeU":       sizeU,
-			"heightUnit":  "U",
+			"heightUnit":  "mm",
 			"orientation": "front",
 			"size":        []float64{1, 1},
 			"sizeUnit":    "cm",

CLI/controllers/template_test.go

@@ -4,6 +4,7 @@ import (
 	"cli/models"
 	test_utils "cli/test"
 	"maps"
+	"math"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -43,7 +44,7 @@ func TestApplyTemplateOfTypeDeviceWorks(t *testing.T) {
 
 	test_utils.MockGetObjTemplate(mockAPI, template)
 
-	sizeU := int((float64(template["sizeWDHmm"].([]any)[2].(int)) / 1000) / models.RACKUNIT)
+	sizeU := int(math.Ceil((float64(template["sizeWDHmm"].([]any)[2].(int)) / 1000) / models.RACKUNIT))
 	err := controller.ApplyTemplate(attributes, device, models.DEVICE)
 	assert.Nil(t, err)
 

CLI/controllers/update_test.go

@@ -86,7 +86,7 @@ func TestUpdateDeviceSizeUmm(t *testing.T) {
 	}
 	mockDataUpdate := map[string]any{
 		"attributes": map[string]any{
-			"sizeU":  float64(1),
+			"sizeU":  1,
 			"height": 44.45,
 		},
 	}
@@ -116,7 +116,7 @@ func TestUpdateDeviceSizeUcm(t *testing.T) {
 	}
 	mockDataUpdate := map[string]any{
 		"attributes": map[string]any{
-			"sizeU":  float64(1),
+			"sizeU":  1,
 			"height": 4.445,
 		},
 	}
@@ -147,7 +147,7 @@ func TestUpdateDeviceheightmm(t *testing.T) {
 	}
 	mockDataUpdate := map[string]any{
 		"attributes": map[string]any{
-			"sizeU":  float64(1),
+			"sizeU":  1,
 			"height": 44.45,
 		},
 	}
@@ -176,7 +176,7 @@ func TestUpdateDeviceheightcm(t *testing.T) {
 	}
 	mockDataUpdate := map[string]any{
 		"attributes": map[string]any{
-			"sizeU":  float64(1),
+			"sizeU":  1,
 			"height": 4.445,
 		},
 	}

CLI/models/attributes.go

@@ -5,7 +5,7 @@ package models
 
 import (
 	l "cli/logger"
-	"cli/utils"
+	u "cli/utils"
 	"errors"
 	"fmt"
 	"strconv"
@@ -125,16 +125,10 @@ func SerialiseVector(attr map[string]interface{}, want string) []float64 {
 }
 
 func SetDeviceSizeUIfExists(attr EntityAttributes) {
-	if sizeU, ok := attr["sizeU"]; ok {
-		//Convert block
-		//And Set height
-		if sizeUInt, ok := sizeU.(int); ok {
-			attr["sizeU"] = sizeUInt
-			attr["height"] = float64(sizeUInt) * RACKUNIT * 1000
-		} else if sizeUFloat, ok := sizeU.(float64); ok {
-			attr["sizeU"] = sizeUFloat
-			attr["height"] = sizeUFloat * RACKUNIT * 1000
-		}
+	if sizeU, ok := attr["sizeU"].(int); ok {
+		attr["sizeU"] = sizeU
+		//Assuming heightUnit="mm"
+		attr["height"] = u.RoundFloat(float64(sizeU)*RACKUNIT*1000, 3)
 	}
 }
 
@@ -251,16 +245,16 @@ func ApplyTemplateToObj(attr, data, tmpl map[string]any, ent int) error {
 
 	// fbxModel section
 	if ent != BLDG && ent != ROOM {
-		utils.CopyMapVal(attr, tmpl, "fbxModel")
+		u.CopyMapVal(attr, tmpl, "fbxModel")
 	}
 
 	// Copy orientation and shape if available
-	utils.CopyMapVal(attr, tmpl, "orientation")
-	utils.CopyMapVal(attr, tmpl, "shape")
+	u.CopyMapVal(attr, tmpl, "orientation")
+	u.CopyMapVal(attr, tmpl, "shape")
 
 	// Merge attributes if available
 	if tmplAttrs, ok := tmpl["attributes"].(map[string]any); ok {
-		utils.MergeMaps(attr, tmplAttrs, false)
+		u.MergeMaps(attr, tmplAttrs, false)
 	}
 
 	return nil

CLI/models/attributes_device.go

@@ -1,8 +1,9 @@
 package models
 
 import (
-	"cli/utils"
+	u "cli/utils"
 	"fmt"
+	"math"
 )
 
 // Compute coherent sizeU or height according to given data
@@ -20,7 +21,7 @@ func ComputeSizeUAndHeight(obj, data map[string]any) error {
 		return err
 	}
 	if newAttrs["sizeU"] != nil {
-		sizeU, err := utils.GetFloat(newAttrs["sizeU"])
+		sizeU, err := u.GetFloat(newAttrs["sizeU"])
 		if err != nil {
 			return err
 		}
@@ -33,10 +34,10 @@ func ComputeSizeUAndHeight(obj, data map[string]any) error {
 		default:
 			return fmt.Errorf(errMsg)
 		}
-		newAttrs["height"] = height
+		newAttrs["height"] = u.RoundFloat(height, 3)
 	}
 	if newAttrs["height"] != nil {
-		height, err := utils.GetFloat(newAttrs["height"])
+		height, err := u.GetFloat(newAttrs["height"])
 		if err != nil {
 			return err
 		}
@@ -49,7 +50,7 @@ func ComputeSizeUAndHeight(obj, data map[string]any) error {
 		default:
 			return fmt.Errorf(errMsg)
 		}
-		newAttrs["sizeU"] = sizeU
+		newAttrs["sizeU"] = int(math.Ceil(sizeU))
 	}
 	return nil
 }
@@ -58,10 +59,10 @@ func SetDeviceSizeUFromTemplate(deviceAttrs, tmpl map[string]any, tmplHeight any
 	if tmplAttrs, ok := tmpl["attributes"].(map[string]any); ok {
 		if tmplType, ok := tmplAttrs["type"].(string); ok &&
 			(tmplType == "chassis" || tmplType == "server") {
-			if height, err := utils.GetFloat(tmplHeight); err != nil {
+			if height, err := u.GetFloat(tmplHeight); err != nil {
 				return err
 			} else {
-				deviceAttrs["sizeU"] = int((height / 1000) / RACKUNIT)
+				deviceAttrs["sizeU"] = int(math.Ceil((height / 1000) / RACKUNIT))
 			}
 		}
 	}

CLI/models/attributes_device_test.go

@@ -122,7 +122,7 @@ func TestSetDeviceSizeUFromTemplateWorks(t *testing.T) {
 	}
 	err := models.SetDeviceSizeUFromTemplate(deviceAttrs, input, any(10000))
 	assert.Nil(t, err)
-	assert.Equal(t, 224, deviceAttrs["sizeU"])
+	assert.Equal(t, 225, deviceAttrs["sizeU"])
 }
 
 // endregion

CLI/utils/util.go

@@ -4,6 +4,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"math"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -321,3 +322,8 @@ func MergeMaps(x, y map[string]interface{}, overwrite bool) {
 
 	}
 }
+
+func RoundFloat(val float64, precision int) float64 {
+	ratio := math.Pow(10, float64(precision))
+	return math.Round(val*ratio) / ratio
+}