refactor: return notified firs as references

Author: AndyTWF

include/ECFMP/flowmeasure/FlowMeasure.h

@@ -97,7 +97,7 @@ namespace ECFMP::FlowMeasure {
          * The flight information region(s) associated with the measure.
          */
         [[nodiscard]] virtual auto NotifiedFlightInformationRegions() const noexcept
-                -> const std::vector<std::shared_ptr<const FlightInformationRegion::FlightInformationRegion>> = 0;
+                -> const std::vector<std::shared_ptr<const FlightInformationRegion::FlightInformationRegion>>& = 0;
 
         /**
          *  Checks if the flow measure is applicable to the given flight information region.

include/mock/FlowMeasureMock.h

@@ -21,7 +21,7 @@ namespace ECFMP::Mock::FlowMeasure {
         MOCK_METHOD(ECFMP::FlowMeasure::MeasureStatus, Status, (), (const, noexcept, override));
         MOCK_METHOD(bool, HasStatus, (ECFMP::FlowMeasure::MeasureStatus), (const, noexcept, override));
         MOCK_METHOD(
-                const std::vector<std::shared_ptr<const ECFMP::FlightInformationRegion::FlightInformationRegion>>,
+                const std::vector<std::shared_ptr<const ECFMP::FlightInformationRegion::FlightInformationRegion>>&,
                 NotifiedFlightInformationRegions, (), (const, noexcept, override)
         );
         MOCK_METHOD(const ECFMP::FlowMeasure::Measure&, Measure, (), (const, noexcept, override));

src/api/FlowMeasureDataParser.cpp

@@ -89,7 +89,7 @@ namespace ECFMP::Api {
             auto flowMeasure = std::make_shared<FlowMeasure::ConcreteFlowMeasure>(
                     flowMeasureData.at("id").get<int>(), event, flowMeasureData.at("ident").get<std::string>(),
                     flowMeasureData.at("reason").get<std::string>(), startTime, endTime, withdrawnAt, measureStatus,
-                    notifiedFirs, std::move(measure), std::move(filters)
+                    std::move(notifiedFirs), std::move(measure), std::move(filters)
             );
             flowMeasures->Add(flowMeasure);
         }

src/flowmeasure/ConcreteFlowMeasure.cpp

@@ -10,7 +10,7 @@ namespace ECFMP::FlowMeasure {
             int id, std::shared_ptr<const Event::Event> event, std::string identifier, std::string reason,
             std::chrono::system_clock::time_point startTime, std::chrono::system_clock::time_point endTime,
             std::chrono::system_clock::time_point withdrawnTime, MeasureStatus status,
-            const std::vector<std::shared_ptr<const FlightInformationRegion::FlightInformationRegion>>& notifiedFirs,
+            const std::vector<std::shared_ptr<const FlightInformationRegion::FlightInformationRegion>> notifiedFirs,
             std::unique_ptr<class Measure> measure, std::unique_ptr<FlowMeasureFilters> filters
     )
         : id(id), event(std::move(event)), identifier(std::move(identifier)),
@@ -72,8 +72,8 @@ namespace ECFMP::FlowMeasure {
         return checkStatus == status;
     }
 
-    const std::vector<std::shared_ptr<const FlightInformationRegion::FlightInformationRegion>>
-    ConcreteFlowMeasure::NotifiedFlightInformationRegions() const noexcept
+    auto ConcreteFlowMeasure::NotifiedFlightInformationRegions() const noexcept
+            -> const std::vector<std::shared_ptr<const FlightInformationRegion::FlightInformationRegion>>&
     {
         return notifiedFirs;
     }

src/flowmeasure/ConcreteFlowMeasure.h

@@ -14,8 +14,7 @@ namespace ECFMP::FlowMeasure {
                 int id, std::shared_ptr<const Event::Event> event, std::string identifier, std::string reason,
                 std::chrono::system_clock::time_point startTime, std::chrono::system_clock::time_point endTime,
                 std::chrono::system_clock::time_point withdrawnTime, MeasureStatus status,
-                const std::vector<std::shared_ptr<const FlightInformationRegion::FlightInformationRegion>>&
-                        notifiedFirs,
+                const std::vector<std::shared_ptr<const FlightInformationRegion::FlightInformationRegion>> notifiedFirs,
                 std::unique_ptr<class Measure> measure, std::unique_ptr<FlowMeasureFilters> filters
         );
         ~ConcreteFlowMeasure() override;
@@ -30,15 +29,15 @@ namespace ECFMP::FlowMeasure {
         [[nodiscard]] auto Status() const noexcept -> MeasureStatus override;
         [[nodiscard]] auto HasStatus(MeasureStatus checkStatus) const noexcept -> bool override;
         [[nodiscard]] auto NotifiedFlightInformationRegions() const noexcept
-                -> const std::vector<std::shared_ptr<const FlightInformationRegion::FlightInformationRegion>> override;
+                -> const std::vector<std::shared_ptr<const FlightInformationRegion::FlightInformationRegion>>& override;
         [[nodiscard]] auto Measure() const noexcept -> const class Measure& override;
         [[nodiscard]] auto Filters() const noexcept -> const FlowMeasureFilters& override;
         [[nodiscard]] auto IsApplicableToFlightInformationRegion(
                 const FlightInformationRegion::FlightInformationRegion& flightInformationRegion
         ) const noexcept -> bool override;
         [[nodiscard]] auto IsApplicableToFlightInformationRegion(const std::string& flightInformationRegion
         ) const noexcept -> bool override;
-        auto ApplicableToAircraft(
+        [[nodiscard]] auto ApplicableToAircraft(
                 const EuroScopePlugIn::CFlightPlan& flightplan, const EuroScopePlugIn::CRadarTarget& radarTarget
         ) const -> bool override;