const all the things as many as possible

haohaolee · haohaolee · commit 1969273fa1a8 · 2021-11-28T11:27:36.000+08:00
diff --git a/rest/controller/MeterReadingController.h b/rest/controller/MeterReadingController.h
@@ -40,7 +40,7 @@ class MeterReadingController {
   MeterReadingController(ElectricityReadingService &electricityReadingService, MeterReadingService &meterReadingService)
       : electricityReadingService_(electricityReadingService), meterReadingService_(meterReadingService) {}
 
-  http::response<http::string_body> Read(const http::request<http::string_body> &req, const std::vector<std::string> &queries) {
+  http::response<http::string_body> Read(const http::request<http::string_body> &req, const std::vector<std::string> &queries) const {
     const auto &meterId = queries[0];
     auto readings = electricityReadingService_.GetReading(meterId);
 
@@ -78,7 +78,7 @@ class MeterReadingController {
   ElectricityReadingService &electricityReadingService_;
   MeterReadingService &meterReadingService_;
   bool IsMeterReadingsValid(const nlohmann::basic_json<> &smartMeterId,
-                            const nlohmann::basic_json<> &electricityReadings) {
+                            const nlohmann::basic_json<> &electricityReadings) const {
     if (smartMeterId.type() == nlohmann::json::value_t::null || electricityReadings.empty()) {
       return false;
     }
diff --git a/rest/controller/PricePlanComparatorController.h b/rest/controller/PricePlanComparatorController.h
@@ -19,7 +19,7 @@ class PricePlanComparatorController {
   PricePlanComparatorController(PricePlanService &pricePlanService) : pricePlanService_(pricePlanService) {}
 
   http::response<http::string_body> Compare(const http::request<http::string_body> &req,
-                                            const std::vector<std::string> &queries) {
+                                            const std::vector<std::string> &queries) const {
     const auto &meterId = queries[0];
     auto costs = pricePlanService_.getConsumptionCostOfElectricityReadingsForEachPricePlan(meterId);
 
@@ -42,7 +42,7 @@ class PricePlanComparatorController {
   }
 
   http::response<http::string_body> Recommend(const http::request<http::string_body> &req,
-                                              const std::vector<std::string> &queries) {
+                                              const std::vector<std::string> &queries) const {
     const auto &meterId = queries[0];
     std::optional<int> maybeLimit;
     if (queries.size() > 2){
diff --git a/rest/domain/MeterReadings.h b/rest/domain/MeterReadings.h
@@ -13,9 +13,9 @@ class MeterReadings {
   MeterReadings(std::string smartMeterId, std::list<ElectricityReading> electricityReadings)
       : smartMeterId_(smartMeterId), electricityReadings_(electricityReadings){};
 
-  std::list<ElectricityReading> getElectricityReadings() { return electricityReadings_; }
+  std::list<ElectricityReading> getElectricityReadings() const { return electricityReadings_; }
 
-  std::string getSmartMeterId() { return smartMeterId_; }
+  std::string getSmartMeterId() const { return smartMeterId_; }
 
  private:
   std::list<ElectricityReading> electricityReadings_;
diff --git a/rest/router.h b/rest/router.h
@@ -13,7 +13,7 @@ namespace http = beast::http;
 class router {
  public:
   template <class Body = http::string_body>
-  auto handler() {
+  auto handler() const {
     return [&](const http::request<Body> &req) -> http::response<http::string_body> {
       const auto uri = req.target();
       for (auto &[path, handler] : handlers_) {
@@ -38,7 +38,7 @@ class router {
 
  private:
   template <class Body, class Allocator>
-  auto make_not_found(const http::request<Body, http::basic_fields<Allocator>> &req, beast::string_view target) {
+  static auto make_not_found(const http::request<Body, http::basic_fields<Allocator>> &req, beast::string_view target) {
     http::response<http::string_body> res{http::status::not_found, req.version()};
     res.set(http::field::server, BOOST_BEAST_VERSION_STRING);
     res.set(http::field::content_type, "text/html");
diff --git a/rest/service/ElectricityReadingService.h b/rest/service/ElectricityReadingService.h
@@ -13,7 +13,7 @@ class ElectricityReadingService {
   ElectricityReadingService(std::unordered_map<std::string, std::vector<ElectricityReading>> &meterAssociatedReadings)
       : meterAssociatedReadings_(meterAssociatedReadings) {}
 
-  std::optional<std::vector<ElectricityReading>> GetReading(const std::string &meterId) {
+  std::optional<std::vector<ElectricityReading>> GetReading(const std::string &meterId) const {
     auto found = meterAssociatedReadings_.find(meterId);
     if (found != meterAssociatedReadings_.end()) {
       return found->second;
diff --git a/rest/service/MeterReadingService.h b/rest/service/MeterReadingService.h
@@ -18,7 +18,7 @@
 
 class MeterReadingService {
  public:
-  std::optional<std::vector<ElectricityReading>> getReadings(const std::string &smartMeterId) {
+  std::optional<std::vector<ElectricityReading>> getReadings(const std::string &smartMeterId) const {
     std::shared_lock<std::shared_mutex> lock(mtx_);
     if (meterAssociatedReadings_.find(smartMeterId) == meterAssociatedReadings_.end()) {
       return {};
diff --git a/rest/service/PricePlanService.h b/rest/service/PricePlanService.h
@@ -16,7 +16,7 @@ class PricePlanService {
  public:
   using time_point_type = std::chrono::time_point<std::chrono::system_clock>;
 
-  std::optional<std::map<std::string, int>> getConsumptionCostOfElectricityReadingsForEachPricePlan(std::string smartMeterId) {
+  std::optional<std::map<std::string, int>> getConsumptionCostOfElectricityReadingsForEachPricePlan(const std::string &smartMeterId) const {
     std::optional<std::vector<ElectricityReading>> electricityReadings = meterReadingService_.getReadings(smartMeterId);
     if (!electricityReadings.has_value()) {
       return {};
@@ -37,11 +37,10 @@ class PricePlanService {
   const std::vector<PricePlan> &pricePlans_;
   MeterReadingService &meterReadingService_;
 
-  static auto calculateTimeElapsed(std::vector<ElectricityReading> electricityReadings) {
+  static auto calculateTimeElapsed(const std::vector<ElectricityReading> &electricityReadings) {
     ElectricityReading first = *electricityReadings.begin();
     ElectricityReading last = *electricityReadings.begin();
-    std::vector<ElectricityReading>::iterator it;
-    for (it = electricityReadings.begin(); it != electricityReadings.end(); it++) {
+    for (auto it = electricityReadings.begin(); it != electricityReadings.end(); it++) {
       if (it->getTime() < first.getTime()) {
         first = *it;
       }
