Fixed #807 - LOTW & eQSL upload status updated even when nothing is uploaded

Author: foldynl

Changelog

@@ -5,6 +5,7 @@ TBC - 0.46.2
 - Fixed Bandmap truncated output despite having space (issue #779)
 - Fixed Statistics - Anti-meridian bug on map (issue #786)
 - Fixed Binary file in the tarballs (issue #794)
+- Fixed LOTW & eQSL upload status updated even when nothing is uploaded (issue #807)
 - Fixed Statistics Dialog does not show confirmed grids
 
 2025/09/26 - 0.46.1

ui/UploadQSODialog.cpp

@@ -303,30 +303,29 @@ void UploadQSODialog::processNextUploader()
              && currentTask.getServiceID() != QRZCOMID
              && currentTask.getServiceID() != WAVELOGID )
         {
-            const QString &statusField = currentTask.getDBUploadStatusFieldName();
-            const QString &dateField = currentTask.getDBUploadDateFieldName();
-            QString statement = QString("UPDATE contacts "
-                                        "SET %1='Y', %2 = strftime('%Y-%m-%d',DATETIME('now', 'utc')) ").arg(statusField,
-                                                                                                             dateField);
 
-            statement.append("WHERE " + currentTask.getWhereClause());
+            const QString statusField = currentTask.getDBUploadStatusFieldName();
+            const QString dateField = currentTask.getDBUploadDateFieldName();
+            const QList<qulonglong> idsToUpdate = currentTask.getQSOIDs();
 
-            if ( !ui->myCallsignCombo->currentText().isEmpty() )
-                statement.append(" AND COALESCE(NULLIF(TRIM(station_callsign), ''), TRIM(operator)) = '" + ui->myCallsignCombo->currentText().trimmed() + "'");
+            QStringList idStrings;
 
-            if ( !ui->myGridCombo->currentText().isEmpty() && ui->myGridCombo->currentIndex() > 0 )
-                statement.append(" AND my_gridsquare = '" + ui->myGridCombo->currentText().trimmed() + "'");
+            for ( qulonglong id : idsToUpdate )
+                idStrings.append(QString::number(id));
 
-            qCDebug(runtime) << statement;
+            QString statement = QString("UPDATE contacts "
+                                        "SET %1='Y', %2 = strftime('%Y-%m-%d',DATETIME('now', 'utc')) "
+                                        "WHERE id IN (%3) ").arg(statusField, dateField, idStrings.join(","));
 
-            QSqlQuery updateQuery(statement);
+            QSqlQuery updateQuery;
+            updateQuery.prepare(statement);
 
             if ( !updateQuery.exec() )
                 qWarning() << "Cannot update" << currentTask.getServiceName()
                            << "Upload status in DB" << updateQuery.lastError().text();
             else
                 currentTask.updateAllDBFieldValue(statusField, "Y",
-                                                  dateField, "2025-05-13");
+                                                  dateField, QDateTime::currentDateTimeUtc().date().toString(Qt::ISODate));
         }
         processNextUploader();
     });
@@ -480,7 +479,6 @@ void UploadQSODialog::executeQuery()
         const QString serviceSelectCondition = whereTemplate.arg(task.getDBUploadStatusFieldName(),
                                                                  uploadStatuses.join(","),
                                                                  addlCondition);
-        task.setWhereClause(serviceSelectCondition);
         serviceSelectConditions << serviceSelectCondition;
         serviceStatusColumns << statusColumnTemplate.arg(serviceSelectCondition,
                                                          QString::number(task.getServiceID()));

ui/UploadQSODialog.h

@@ -73,11 +73,12 @@ private slots:
             enableWidget->setToolTip((isActivable) ? ""
                                                    : tr("Service is not configured properly.<p> Please, use <b>Settings</b> dialog to configure it.</p>"));
         };
-        ~UploadTask() {if ( uploader ) uploader->deleteLater();};
+
+        ~UploadTask() {};
 
         ServiceID getServiceID() const {return serviceID;};
-        void addQSO(QSharedPointer<QSqlRecord> record) {qsoRefs.append(record);};
-        void clearEnqueuedQSOs() {qsoRefs.clear();};
+        void addQSO(QSharedPointer<QSqlRecord> record) {qsoRefs.append(record); qsoIds.append(record->value("id").toULongLong());};
+        void clearEnqueuedQSOs() {qsoRefs.clear(); qsoIds.clear();};
         const QList<QSqlRecord> getQSOList() const
         {
             QList<QSqlRecord> retList;
@@ -89,14 +90,12 @@ private slots:
             }
             return retList;
         };
-
+        const QList<qulonglong>& getQSOIDs() const { return qsoIds; };
         bool isChecked() {return (controElement) ? controElement->isChecked() : false;};
         const QString& getDBUploadStatusFieldName() const {return dbUploadStatusFieldName;};
         const QString& getDBUploadDateFieldName() const {return dbUploadDateFieldName;};
         const QString& getServiceName() const {return serviceName;};
         GenericQSOUploader *getUploader() const {return uploader;};
-        void setWhereClause(const QString &clause) {finalWhereClause = clause;};
-        const QString& getWhereClause() const {return finalWhereClause;};
         void updateQSONumberLabel() {qsoNumberLabel->setText((isChecked()) ? "(" + QString::number(qsoRefs.size()) + ")"
                                                                          : "");};
         bool isQSOListEmpty() const {return qsoRefs.isEmpty(); };
@@ -120,10 +119,10 @@ private slots:
         QString serviceName;
         GenericQSOUploader *uploader;
         QList<QWeakPointer<QSqlRecord>> qsoRefs;
+        QList<qulonglong> qsoIds;
         QCheckBox *controElement;
         QString dbUploadStatusFieldName;
         QString dbUploadDateFieldName;
-        QString finalWhereClause;
         QLabel *qsoNumberLabel;
     };