fix: machs are integers in the api

Author: AndyTWF

src/api/FlowMeasureMeasureParser.cpp

@@ -2,6 +2,7 @@
 #include "ECFMP/log/Logger.h"
 #include "flowmeasure/ConcreteMeasure.h"
 #include "nlohmann/json.hpp"
+#include <string>
 
 namespace ECFMP::Api {
 
@@ -50,10 +51,11 @@ namespace ECFMP::Api {
         // If the type is MaxMach, MachReduction, then the value must be a double
         if (type == FlowMeasure::MeasureType::MaxMach || type == FlowMeasure::MeasureType::MachReduction) {
 
-            if (!data["value"].is_number_float())
+            if (!data["value"].is_number_integer())
                 return nullptr;
 
-            return std::make_unique<FlowMeasure::ConcreteMeasure>(type, data["value"].get<double>());
+            // Machs in the API are stored as integers, so we need to divide by 100
+            return std::make_unique<FlowMeasure::ConcreteMeasure>(type, data["value"].get<double>() / 100);
         }
 
         // If the type is MandatoryRoute, then the value must be a set of strings

test/api/FlowMeasureMeasureParserTest.cpp

@@ -78,7 +78,7 @@ namespace ECFMPTest::Api {
         const auto& param = GetParam();
         nlohmann::json json;
         json["type"] = param.jsonType;
-        json["value"] = param.jsonValue;
+        json["value"] = (int) (param.jsonValue * 100);
         auto measure = parser.Parse(json);
         EXPECT_NE(measure, nullptr);
         EXPECT_EQ(measure->Type(), param.expectedType);
@@ -90,9 +90,14 @@ namespace ECFMPTest::Api {
             testing::Values(
                     FlowMeasureMeasureTestCase<double>{
                             "max_mach", "max_mach", 5.0, ECFMP::FlowMeasure::MeasureType::MaxMach, 5.0},
+                    FlowMeasureMeasureTestCase<double>{
+                            "max_mach_less_than_1", "max_mach", 0.25, ECFMP::FlowMeasure::MeasureType::MaxMach, 0.25},
                     FlowMeasureMeasureTestCase<double>{
                             "mach_reduction", "mach_reduction", 5.0, ECFMP::FlowMeasure::MeasureType::MachReduction,
-                            5.0}
+                            5.0},
+                    FlowMeasureMeasureTestCase<double>{
+                            "mach_reduction_less_than_1", "mach_reduction", 0.25,
+                            ECFMP::FlowMeasure::MeasureType::MachReduction, 0.25}
             ),
             [](const testing::TestParamInfo<FlowMeasureMeasureTestCase<double>>& info) {
                 return info.param.description;