fix unit converter applying incorrect conversion

HyperloopUPV-H8 · Apr 13, 2024 · 49c2943 · 49c2943
1 parent 7f49e56
commit 49c2943
Showing 1 changed file with 67 additions and 37 deletions.
diff --git a/backend/pkg/transport/packet/data/converter.go b/backend/pkg/transport/packet/data/converter.go
@@ -13,55 +13,85 @@ type Operation struct {
 func newConvertNumeric[N numeric](podConversion, displayConversion ConversionDescriptor) valueConverter {
 	return func(value Value) Value {
 		numeric := value.(NumericValue[N])
-		for _, operation := range append(podConversion, displayConversion...) {
-			switch operation.Operator {
-			case "+":
-				numeric.inner += N(operation.Operand)
-			case "-":
-				numeric.inner -= N(operation.Operand)
-			case "*":
-				numeric.inner *= N(operation.Operand)
-			case "/":
-				numeric.inner /= N(operation.Operand)
-			}
-		}
+		numeric.inner = applyOperations(numeric.inner, podConversion)
+		numeric.inner = revertOperations(numeric.inner, displayConversion)
 		return numeric
 	}
 }
 
 func newRevertNumeric[N numeric](podConversion, displayConversion ConversionDescriptor) valueReverter {
 	return func(value Value) Value {
 		numeric := value.(NumericValue[N])
-		for i := len(displayConversion) - 1; i >= 0; i-- {
-			operation := displayConversion[i]
-			switch operation.Operator {
-			case "+":
-				numeric.inner -= N(operation.Operand)
-			case "-":
-				numeric.inner += N(operation.Operand)
-			case "*":
-				numeric.inner /= N(operation.Operand)
-			case "/":
-				numeric.inner *= N(operation.Operand)
-			}
+		numeric.inner = applyOperationsInv(numeric.inner, displayConversion)
+		numeric.inner = revertOperationsInv(numeric.inner, podConversion)
+		return numeric
+	}
+}
+
+func applyOperations[N numeric](original N, conversion ConversionDescriptor) N {
+	for _, operation := range conversion {
+		switch operation.Operator {
+		case "+":
+			original += N(operation.Operand)
+		case "-":
+			original -= N(operation.Operand)
+		case "*":
+			original *= N(operation.Operand)
+		case "/":
+			original /= N(operation.Operand)
 		}
+	}
+	return original
+}
 
-		for i := len(podConversion) - 1; i >= 0; i-- {
-			operation := podConversion[i]
-			switch operation.Operator {
-			case "+":
-				numeric.inner -= N(operation.Operand)
-			case "-":
-				numeric.inner += N(operation.Operand)
-			case "*":
-				numeric.inner /= N(operation.Operand)
-			case "/":
-				numeric.inner *= N(operation.Operand)
-			}
+func revertOperations[N numeric](original N, conversion ConversionDescriptor) N {
+	for _, operation := range conversion {
+		switch operation.Operator {
+		case "+":
+			original -= N(operation.Operand)
+		case "-":
+			original += N(operation.Operand)
+		case "*":
+			original /= N(operation.Operand)
+		case "/":
+			original *= N(operation.Operand)
 		}
+	}
+	return original
+}
 
-		return numeric
+func applyOperationsInv[N numeric](original N, conversion ConversionDescriptor) N {
+	for i := len(conversion) - 1; i >= 0; i-- {
+		operation := conversion[i]
+		switch operation.Operator {
+		case "+":
+			original += N(operation.Operand)
+		case "-":
+			original -= N(operation.Operand)
+		case "*":
+			original *= N(operation.Operand)
+		case "/":
+			original /= N(operation.Operand)
+		}
+	}
+	return original
+}
+
+func revertOperationsInv[N numeric](original N, conversion ConversionDescriptor) N {
+	for i := len(conversion) - 1; i >= 0; i-- {
+		operation := conversion[i]
+		switch operation.Operator {
+		case "+":
+			original -= N(operation.Operand)
+		case "-":
+			original += N(operation.Operand)
+		case "*":
+			original /= N(operation.Operand)
+		case "/":
+			original *= N(operation.Operand)
+		}
 	}
+	return original
 }
 
 func convertBoolean(value Value) Value {