Merge branch 'master' of https://git.mimbach49.de/GerhardHoffmann/MOBILISIS-Calculator

(expects UTC-time instead of local time.)

library/include/mobilisis/calculate_price.h

@@ -4,6 +4,8 @@
 #include <time.h>
 #include <inttypes.h>
 
+#include <QString>
+
 #ifdef WIN32
 #ifdef CALCULATE_LIBRARY_EXPORTS
 #define CALCULATE_LIBRARY_API __declspec(dllexport)
@@ -30,14 +32,90 @@ struct CALCULATE_LIBRARY_API price_t {
     double vat;
 };
 
-bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file);
+struct CALCULATE_LIBRARY_API CalcState {
+    enum class State : uint8_t {
+        SUCCESS,
+        ERROR_PARSING_ZONE_NR,
+        ERROR_LOADING_TARIFF,
+        ERROR_PARSING_TARIFF,
+        NEGATIVE_PARING_TIME,
+        INVALID_START_DATE,
+        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;
+        case State::INVALID_START_DATE:
+            s = "INVALID_START_DATE";
+            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();
 
-bool CALCULATE_LIBRARY_API compute_price_for_parking_ticket(parking_tariff_t *tariff,
-                                      time_t start_parking_time,
-                                      time_t end_parking_time,
-                                      struct price_t *price);
+CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
+                                            parking_tariff_t *tariff,
+                                            time_t start_parking_time,
+                                            time_t end_parking_time,
+                                            struct price_t *price);
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
+                                            parking_tariff_t *tariff,
+                                            time_t start_parking_time,
+                                            double cost,
+                                            QString &duration);
 #ifdef __cplusplus
 } // extern "C"
 #endif

library/src/calculate_price.cpp

@@ -16,19 +16,18 @@ 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;
 }
 
-bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) {
+CalcState 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
@@ -36,7 +35,9 @@ bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *co
     qCritical() << "      ... zone = " << zone;
 
     if (zone <= 0) {
-        return false;
+        delete *tariff;
+        *tariff = nullptr;
+        return calcState.set(CalcState::State::ERROR_PARSING_ZONE_NR);
     }
 
     QString confFile(config_file);
@@ -53,57 +54,109 @@ bool CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *co
     qCritical() << "      ... confFile = " << confFile;
 
     QFile fname(confFile);
-    if (fname.exists()) {
-
+    if (fname.exists() &&
+        fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
         // DEBUG
-        qCritical() << "      ... confFile exists";
+        qCritical() << "      ... confFile is open";
 
-        if (fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
-
-            // DEBUG
-            qCritical() << "      ... confFile is open";
-
-            QString json = fname.readAll();
-            return (*tariff)->ParseJson(*tariff, json.toStdString().c_str());
+        QString json = fname.readAll();
+        if (! (*tariff)->ParseJson(*tariff, json.toStdString().c_str())) {
+            delete *tariff;
+            *tariff = nullptr;
+            return calcState.set(CalcState::State::ERROR_PARSING_TARIFF);
         }
+    } else {
+        delete *tariff;
+        *tariff = nullptr;
+        return calcState.set(CalcState::State::ERROR_LOADING_TARIFF);
     }
 
-    qCritical() << "init_tariff: Parsing tariff config (" << confFile << ") failed!";
+    qCritical() << "init_tariff: Parsing tariff config (" << confFile << ")";
 
-    return false;
+    return calcState;
 }
 
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
-    delete tariff;
+    if (tariff != nullptr) {
+        delete tariff;
+    }
 }
 
-bool CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
-                                      parking_tariff_t *tariff,
-                                      time_t start_parking_time, // in minutes
-                                      time_t end_parking_time,   // in minutes
-                                      struct price_t *price) {
+CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
+                                    parking_tariff_t *tariff,
+                                    time_t start_parking_time, // in minutes
+                                    time_t end_parking_time,   // in minutes
+                                    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) {
-        QDate const d(1970, 1, 1);
-        QTime const t(0, 0, 0);
-        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);
-            price->units = cost;
-            price->netto = cost;
-            return true;
-        }
-    } else
+    if (duration < 0) {
+        calcState.setDesc(QString("end=%1, start=%2")
+                            .arg(end_parking_time, start_parking_time));
+        return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
+    }
+    if (duration > maxMin) {
+        calcState.setDesc(QString("duration=%1, maxMin=%2").arg(duration, maxMin));
+        return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
+    }
+    if (duration < minMin) {
+        calcState.setDesc(QString("duration=%1, minMin=%2").arg(duration, minMin));
+        return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
+    }
     if (duration == 0) {
         memset(price, 0x00, sizeof(*price));
-        return true;
+        return calcState.set(CalcState::State::SUCCESS);
     }
-    qCritical() << "ERROR start_parking_time (" << start_parking_time << ") <"
-                << "end_parking_time (" << end_parking_time << ")";
-    return false;
+
+    QDate const d(1970, 1, 1);
+    QTime const t(0, 0, 0);
+    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;
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
+}
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
+                                            parking_tariff_t *tariff,
+                                            time_t start_parking_time,
+                                            double price,
+                                            QString &duration) {
+    CalcState calcState;
+    QDate const d(1970, 1, 1);
+    QTime const t(0, 0, 0);
+    QDateTime start(d, t, Qt::UTC);
+    start = start.toLocalTime().addSecs(start_parking_time * 60);
+    if (start.isValid()) {
+        QString cs = start.toString(Qt::ISODate);
+        duration = calculator.GetDurationFromCost(tariff, PaymentOption::Option1,
+                                                  cs.toLocal8Bit().constData(),
+                                                  price, false, true).c_str();
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
 }

library/src/calculator_functions.cpp

@@ -10,7 +10,12 @@ double total_cost = 0.0f;
 bool overtime = false;
 
 /// <inheritdoc/>
-std::string Calculator::GetDurationFromCost(Configuration* cfg, uint8_t payment_option, char const* start_datetime, double price, bool nextDay, bool prepaid)
+std::string Calculator::GetDurationFromCost(Configuration* cfg,
+                                            uint8_t payment_option,
+                                            char const* start_datetime, // given in local time
+                                            double price,
+                                            bool nextDay,
+                                            bool prepaid)
 {
 	// Get current date time from input
 	struct tm current_datetime = Utilities::DateTimeToStructTm(start_datetime);
@@ -264,13 +269,35 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg, uint8_t payment_
 	else ret_val = total_duration_min;
 
 	cout << "Total minutes: " << (int)ret_val << endl;
-	if (ret_val <= 0) return "PARKING NOT ALLOWED";
+    if (ret_val <= 0) return "PARKING NOT ALLOWED";
 
-	struct tm valid_until_datetime = *localtime(&valid_until_datetime_t);
-	LOG_DEBUG("Ticket is valid until ", asctime(&valid_until_datetime));
+#if !defined(_SVID_SOURCE) && !defined(_XOPEN_SOURCE)
+    // needed for timezone-correction
+    #error "!defined(_SVID_SOURCE) && !defined(_XOPEN_SOURCE)"
+#else
+    // timezone correction: localtime() needs argument in UTC-timezone
+    // The global variable 'timezone' is set by tzset(), see
+    // https://linux.die.net/man/3/tzset, so I change of the timezone will
+    // also change the value of the variable 'timezone'.
+    valid_until_datetime_t += timezone;
+#endif
+
+    struct tm valid_until_datetime;
+    memset(&valid_until_datetime, 0x00, sizeof(valid_until_datetime));
+
+    if (!localtime_r(&valid_until_datetime_t, &valid_until_datetime)) {
+        return "LOCALTIME_R() ERROR";
+    }
+
+    // return in ISO-format: "%Y-%m-%dT%H:%M:%S"
+    char buf[128];
+    memset(buf, 0x00, sizeof(buf));
+    strftime(buf, sizeof(buf)-1, "%Y-%m-%dT%H:%M:%S", &valid_until_datetime);
+
+    LOG_DEBUG("Ticket is valid until ", buf);
 
 	total_duration_min = 0.0f;
-	return asctime(&valid_until_datetime);
+    return std::string(buf);
 }
 
 ///////////////////////////////////////
@@ -509,5 +536,6 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
 
 	double ret_val = total_cost;
 	total_cost = 0.0f;
-	return floor(ret_val);
+    return ceil(ret_val);
+    // return floor(ret_val);
 }

main/main.cpp

@@ -80,7 +80,8 @@ int main() {
         memset(&now, 0, sizeof(now));
         strptime("2023-04-30T06:00:00", "%Y-%m-%dT%H:%M:%S", &now);
         now.tm_hour -= 1; // for ctime
-        for (int i=0; i<6*24; ++i) {
+        // for (int i=0; i<6*24; ++i) {
+        for (int i=0; i<1; ++i) {
             int const duration = 120;
             time_t t = mktime(&now);
             start_parking_time = t / 60;