revert: remove LoTW sync type support (QSL/QSO delta/full)
This reverts commit 5b78935 which added:
- Sync type parameter (qsl_delta, qsl_full, qso_delta, qso_full)
- getLastLoTWQSODate() function
- Sync type dropdown on QSO page
- Job queue handling of sync types
Reason: LoTW doesn't provide DXCC entity data for unconfirmed QSOs,
which causes award calculation issues. Going back to QSL-only sync.
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -22,13 +22,10 @@ const activeJobs = new Map();
|
||||
* Enqueue a new sync job
|
||||
* @param {number} userId - User ID
|
||||
* @param {string} jobType - Type of job ('lotw_sync' or 'dcl_sync')
|
||||
* @param {Object} options - Optional job parameters
|
||||
* @param {string} options.syncType - LoTW sync type: 'qsl_delta' (default), 'qsl_full', 'qso_delta', 'qso_full'
|
||||
* @returns {Promise<Object>} Job object with ID
|
||||
*/
|
||||
export async function enqueueJob(userId, jobType = 'lotw_sync', options = {}) {
|
||||
const { syncType = 'qsl_delta' } = options;
|
||||
logger.debug('Enqueueing sync job', { userId, jobType, syncType });
|
||||
export async function enqueueJob(userId, jobType = 'lotw_sync') {
|
||||
logger.debug('Enqueueing sync job', { userId, jobType });
|
||||
|
||||
// Check for existing active job of the same type
|
||||
const existingJob = await getUserActiveJob(userId, jobType);
|
||||
@@ -52,10 +49,10 @@ export async function enqueueJob(userId, jobType = 'lotw_sync', options = {}) {
|
||||
})
|
||||
.returning();
|
||||
|
||||
logger.info('Job created', { jobId: job.id, userId, jobType, syncType });
|
||||
logger.info('Job created', { jobId: job.id, userId, jobType });
|
||||
|
||||
// Start processing asynchronously (don't await)
|
||||
processJobAsync(job.id, userId, jobType, syncType).catch((error) => {
|
||||
processJobAsync(job.id, userId, jobType).catch((error) => {
|
||||
logger.error(`Job processing error`, { jobId: job.id, error: error.message });
|
||||
});
|
||||
|
||||
@@ -76,9 +73,8 @@ export async function enqueueJob(userId, jobType = 'lotw_sync', options = {}) {
|
||||
* @param {number} jobId - Job ID
|
||||
* @param {number} userId - User ID
|
||||
* @param {string} jobType - Type of job ('lotw_sync' or 'dcl_sync')
|
||||
* @param {string} syncType - LoTW sync type: 'qsl_delta', 'qsl_full', 'qso_delta', 'qso_full'
|
||||
*/
|
||||
async function processJobAsync(jobId, userId, jobType, syncType = 'qsl_delta') {
|
||||
async function processJobAsync(jobId, userId, jobType) {
|
||||
const jobPromise = (async () => {
|
||||
try {
|
||||
const { getUserById } = await import('./auth.service.js');
|
||||
@@ -134,28 +130,15 @@ async function processJobAsync(jobId, userId, jobType, syncType = 'qsl_delta') {
|
||||
return null;
|
||||
}
|
||||
|
||||
// Get the appropriate date based on sync type
|
||||
const { getLastLoTWQSODate, getLastLoTWQSLDate, syncQSOs } = await import('./lotw.service.js');
|
||||
// Get last QSL date for incremental sync
|
||||
const { getLastLoTWQSLDate, syncQSOs } = await import('./lotw.service.js');
|
||||
const lastQSLDate = await getLastLoTWQSLDate(userId);
|
||||
const sinceDate = lastQSLDate || new Date('2000-01-01');
|
||||
|
||||
let sinceDate = null;
|
||||
let dateSource = '';
|
||||
|
||||
if (syncType.includes('delta')) {
|
||||
// Delta sync: use date filter
|
||||
if (syncType === 'qso_delta') {
|
||||
const lastQSODate = await getLastLoTWQSODate(userId);
|
||||
sinceDate = lastQSODate || new Date('2000-01-01');
|
||||
dateSource = lastQSODate ? 'QSO' : 'full';
|
||||
} else {
|
||||
// qsl_delta
|
||||
const lastQSLDate = await getLastLoTWQSLDate(userId);
|
||||
sinceDate = lastQSLDate || new Date('2000-01-01');
|
||||
dateSource = lastQSLDate ? 'QSL' : 'full';
|
||||
}
|
||||
logger.info(`Job ${jobId}: LoTW ${syncType} sync`, { since: sinceDate.toISOString().split('T')[0], source: dateSource });
|
||||
if (lastQSLDate) {
|
||||
logger.info(`Job ${jobId}: LoTW incremental sync`, { since: sinceDate.toISOString().split('T')[0] });
|
||||
} else {
|
||||
// Full sync: no date filter
|
||||
logger.info(`Job ${jobId}: LoTW ${syncType} full sync`);
|
||||
logger.info(`Job ${jobId}: LoTW full sync`);
|
||||
}
|
||||
|
||||
// Update job progress
|
||||
@@ -164,8 +147,8 @@ async function processJobAsync(jobId, userId, jobType, syncType = 'qsl_delta') {
|
||||
step: 'fetch',
|
||||
});
|
||||
|
||||
// Execute the sync with syncType
|
||||
result = await syncQSOs(userId, user.lotwUsername, user.lotwPassword, sinceDate, jobId, syncType);
|
||||
// Execute the sync
|
||||
result = await syncQSOs(userId, user.lotwUsername, user.lotwPassword, sinceDate, jobId);
|
||||
}
|
||||
|
||||
// Update job as completed
|
||||
|
||||
@@ -49,24 +49,15 @@ const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
|
||||
|
||||
/**
|
||||
* Fetch QSOs from LoTW with retry support
|
||||
* @param {string} lotwUsername - LoTW username
|
||||
* @param {string} lotwPassword - LoTW password
|
||||
* @param {Date|null} sinceDate - Optional date for incremental sync
|
||||
* @param {string} syncType - Type of sync: 'qsl_delta' (default), 'qsl_full', 'qso_delta', 'qso_full'
|
||||
*/
|
||||
async function fetchQSOsFromLoTW(lotwUsername, lotwPassword, sinceDate = null, syncType = 'qsl_delta') {
|
||||
async function fetchQSOsFromLoTW(lotwUsername, lotwPassword, sinceDate = null) {
|
||||
const url = 'https://lotw.arrl.org/lotwuser/lotwreport.adi';
|
||||
|
||||
// Determine qso_qsl parameter based on sync type
|
||||
// qsl_* = only QSLs (confirmed QSOs)
|
||||
// qso_* = all QSOs (confirmed + unconfirmed)
|
||||
const qsoQslValue = syncType.startsWith('qsl') ? 'yes' : 'no';
|
||||
|
||||
const params = new URLSearchParams({
|
||||
login: lotwUsername,
|
||||
password: lotwPassword,
|
||||
qso_query: '1',
|
||||
qso_qsl: qsoQslValue,
|
||||
qso_qsl: 'yes',
|
||||
qso_qsldetail: 'yes',
|
||||
qso_mydetail: 'yes',
|
||||
qso_withown: 'yes',
|
||||
@@ -75,9 +66,9 @@ async function fetchQSOsFromLoTW(lotwUsername, lotwPassword, sinceDate = null, s
|
||||
if (sinceDate) {
|
||||
const dateStr = sinceDate.toISOString().split('T')[0];
|
||||
params.append('qso_qslsince', dateStr);
|
||||
logger.debug('Incremental sync', { syncType, since: dateStr });
|
||||
logger.debug('Incremental sync since', { date: dateStr });
|
||||
} else {
|
||||
logger.debug('Full sync', { syncType });
|
||||
logger.debug('Full sync - fetching all QSOs');
|
||||
}
|
||||
|
||||
const fullUrl = `${url}?${params.toString()}`;
|
||||
@@ -196,9 +187,8 @@ function convertQSODatabaseFormat(adifQSO, userId) {
|
||||
* @param {string} lotwPassword - LoTW password
|
||||
* @param {Date|null} sinceDate - Optional date for incremental sync
|
||||
* @param {number|null} jobId - Optional job ID for progress tracking
|
||||
* @param {string} syncType - Type of sync: 'qsl_delta' (default), 'qsl_full', 'qso_delta', 'qso_full'
|
||||
*/
|
||||
export async function syncQSOs(userId, lotwUsername, lotwPassword, sinceDate = null, jobId = null, syncType = 'qsl_delta') {
|
||||
export async function syncQSOs(userId, lotwUsername, lotwPassword, sinceDate = null, jobId = null) {
|
||||
if (jobId) {
|
||||
await updateJobProgress(jobId, {
|
||||
message: 'Fetching QSOs from LoTW...',
|
||||
@@ -206,7 +196,7 @@ export async function syncQSOs(userId, lotwUsername, lotwPassword, sinceDate = n
|
||||
});
|
||||
}
|
||||
|
||||
const adifQSOs = await fetchQSOsFromLoTW(lotwUsername, lotwPassword, sinceDate, syncType);
|
||||
const adifQSOs = await fetchQSOsFromLoTW(lotwUsername, lotwPassword, sinceDate);
|
||||
|
||||
// Check for error response from LoTW fetch
|
||||
if (!adifQSOs) {
|
||||
@@ -514,27 +504,6 @@ export async function getLastLoTWQSLDate(userId) {
|
||||
return new Date(`${year}-${month}-${day}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the date of the last LoTW QSO for a user (for incremental sync of all QSOs)
|
||||
*/
|
||||
export async function getLastLoTWQSODate(userId) {
|
||||
const [result] = await db
|
||||
.select({ maxDate: max(qsos.qsoDate) })
|
||||
.from(qsos)
|
||||
.where(eq(qsos.userId, userId));
|
||||
|
||||
if (!result || !result.maxDate) return null;
|
||||
|
||||
const dateStr = result.maxDate;
|
||||
if (!dateStr || dateStr === '') return null;
|
||||
|
||||
const year = dateStr.substring(0, 4);
|
||||
const month = dateStr.substring(4, 6);
|
||||
const day = dateStr.substring(6, 8);
|
||||
|
||||
return new Date(`${year}-${month}-${day}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete all QSOs for a user
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user