library/include/mobilisis/calculate_price.h

@@ -4,8 +4,6 @@
 #include <time.h>
 #include <inttypes.h>
 
-#include <QString>
-
 #ifdef WIN32
 #ifdef CALCULATE_LIBRARY_EXPORTS
 #define CALCULATE_LIBRARY_API __declspec(dllexport)
@@ -32,79 +30,14 @@ struct CALCULATE_LIBRARY_API price_t {
     double vat;
 };
 
-struct CALCULATE_LIBRARY_API CalcState {
+bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file);
-    enum class State : uint8_t {
-        SUCCESS,
-        ERROR_PARSING_ZONE_NR,
-        ERROR_LOADING_TARIFF,
-        ERROR_PARSING_TARIFF,
-        NEGATIVE_PARING_TIME,
-        WRONG_PARAM_VALUES,
-        ABOVE_MAX_PARKING_TIME,
-        BELOW_MIN_PARKING_TIME,
-        BELOW_MIN_PARKING_PRICE,
-        OVERPAID
-    };
-
-    State m_status;
-    QString m_desc;
-
-    explicit CalcState() : m_status(State::SUCCESS), m_desc("") {}
-
-    explicit operator bool() const noexcept {
-        return (m_status == State::SUCCESS);
-    }
-
-    explicit operator QString () const noexcept {
-        QString s;
-        switch (m_status) {
-        case State::SUCCESS:
-            s = "SUCCESS";
-            break;
-        case State::ERROR_PARSING_ZONE_NR:
-            s = "ERROR_PARSING_ZONE_NR";
-            break;
-        case State::ERROR_LOADING_TARIFF:
-            s = "ERROR_LOADING_TARIFF";
-            break;
-        case State::ERROR_PARSING_TARIFF:
-            s = "ERROR_PARSING_TARIFF";
-            break;
-        case State::NEGATIVE_PARING_TIME:
-            s = "NEGATIVE_PARKING_TIME";
-            break;
-        case State::ABOVE_MAX_PARKING_TIME:
-            s = "ABOVE_MAX_PARKING_TIME";
-            break;
-        case State::WRONG_PARAM_VALUES:
-            s = "WRONG_PARAM_VALUES";
-            break;
-        case State::BELOW_MIN_PARKING_TIME:
-            s = "BELOW_MIN_PARKING_TIME";
-            break;
-        case State::BELOW_MIN_PARKING_PRICE:
-            s = "BELOW_MIN_PARKING_PRICE";
-            break;
-        case State::OVERPAID:
-            s = "OVERPAID";
-            break;
-        }
-        return s + ":" + m_desc;
-    }
-
-    CalcState &set(State s) { m_status = s; return *this; }
-    CalcState &setDesc(QString s) { m_desc = s; return *this; }
-};
-
-CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
-                                            char const *config_file);
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
 int CALCULATE_LIBRARY_API get_zone_nr();
 
-CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(parking_tariff_t *tariff,
+bool CALCULATE_LIBRARY_API compute_price_for_parking_ticket(parking_tariff_t *tariff,
-                                            time_t start_parking_time,
+                                      time_t start_parking_time,
-                                            time_t end_parking_time,
+                                      time_t end_parking_time,
-                                            struct price_t *price);
+                                      struct price_t *price);
 #ifdef __cplusplus
 } // extern "C"
 #endif

library/src/calculate_price.cpp

@@ -16,18 +16,19 @@ int CALCULATE_LIBRARY_API get_zone_nr() {
         QFileInfo finfo(zone);
         if (finfo.size() <= 4) { // decimal 000\n
             if (zone.open(QIODevice::ReadOnly | QIODevice::Text)) {
+
                 QTextStream in(&zone);
                 return in.readLine(100).toInt();
+
             }
         }
     }
     return -1;
 }
 
-CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) {
+bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) {
     *tariff = new Configuration();
 
-    CalcState calcState;
     int const zone = get_zone_nr();
 
     // DEBUG
@@ -35,7 +36,7 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
     qCritical() << "      ... zone = " << zone;
 
     if (zone <= 0) {
-        return calcState.set(CalcState::State::ERROR_PARSING_ZONE_NR);
+        return false;
     }
 
     QString confFile(config_file);
@@ -52,79 +53,57 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
     qCritical() << "      ... confFile = " << confFile;
 
     QFile fname(confFile);
-    if (fname.exists() &&
+    if (fname.exists()) {
-        fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        // DEBUG
-        qCritical() << "      ... confFile is open";
 
-        QString json = fname.readAll();
+        // DEBUG
-        if (! (*tariff)->ParseJson(*tariff, json.toStdString().c_str())) {
+        qCritical() << "      ... confFile exists";
-            calcState.m_status = CalcState::State::ERROR_PARSING_TARIFF;
+
+        if (fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
+
+            // DEBUG
+            qCritical() << "      ... confFile is open";
+
+            QString json = fname.readAll();
+            return (*tariff)->ParseJson(*tariff, json.toStdString().c_str());
         }
-    } else {
-        calcState.m_status = CalcState::State::ERROR_LOADING_TARIFF;
     }
 
     qCritical() << "init_tariff: Parsing tariff config (" << confFile << ") failed!";
 
-    return calcState;
+    return false;
 }
 
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
     delete tariff;
 }
 
-CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
+bool CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
-                                    parking_tariff_t *tariff,
+                                      parking_tariff_t *tariff,
-                                    time_t start_parking_time, // in minutes
+                                      time_t start_parking_time, // in minutes
-                                    time_t end_parking_time,   // in minutes
+                                      time_t end_parking_time,   // in minutes
-                                    struct price_t *price) {
+                                      struct price_t *price) {
-    CalcState calcState;
-    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
-    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
-
-    if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
-        calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin, maxMin));
-        return calcState.set(CalcState::State::WRONG_PARAM_VALUES);
-    }
-
     int const duration = end_parking_time - start_parking_time;
-    if (duration < 0) {
+    if (duration > 0) {
-        calcState.setDesc(QString("end=%1, start=%2")
+        QDate const d(1970, 1, 1);
-                            .arg(end_parking_time, start_parking_time));
+        QTime const t(0, 0, 0);
-        return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
+        QDateTime start(d, t, Qt::UTC);
-    }
+        start = start.toLocalTime().addSecs(start_parking_time * 60);
-    if (duration > maxMin) {
+        if (start.isValid()) {
-        calcState.setDesc(QString("duration=%1, maxMin=%2").arg(duration, maxMin));
+            QString cs = start.toString(Qt::ISODate);
-        return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
+            double cost = calculator.GetCostFromDuration(
-    }
+                            tariff, PaymentOption::Option1,
-    if (duration < minMin) {
+                            cs.toLocal8Bit().constData(),
-        calcState.setDesc(QString("duration=%1, minMin=%2").arg(duration, minMin));
+                            duration, false, true);
-        return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
+            price->units = cost;
-    }
+            price->netto = cost;
+            return true;
+        }
+    } else
     if (duration == 0) {
         memset(price, 0x00, sizeof(*price));
-        return calcState.set(CalcState::State::SUCCESS);
+        return true;
     }
-
+    qCritical() << "ERROR start_parking_time (" << start_parking_time << ") <"
-    QDate const d(1970, 1, 1);
+                << "end_parking_time (" << end_parking_time << ")";
-    QTime const t(0, 0, 0);
+    return false;
-    QDateTime start(d, t, Qt::UTC);
-    start = start.toLocalTime().addSecs(start_parking_time * 60);
-    if (start.isValid()) {
-        QString cs = start.toString(Qt::ISODate);
-        double cost = calculator.GetCostFromDuration(
-                        tariff, PaymentOption::Option1,
-                        cs.toLocal8Bit().constData(),
-                        duration, false, true);
-        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
-        if (cost < minCost) {
-            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
-            return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
-        }
-        price->units = cost;
-        price->netto = cost;
-    }
-
-    return calcState.set(CalcState::State::SUCCESS);
 }