ProcessSentMessages added for server acks

client/sendjobs.go

@@ -258,6 +258,74 @@ func GetSendJob(storagePath, queue string, id int64) (*SendJob, error) {
 	return job, nil
 }
 
+// GetSentJobs returns all successfully-sent jobs from the named queue,
+// ordered oldest first. Use this to reconcile delivery status with the
+// message store and clean up completed entries.
+func GetSentJobs(storagePath, queue string) ([]*SendJob, error) {
+	db, err := openOrCreateSendQueue(sendQueueDbPath(storagePath, queue))
+	if err != nil {
+		return nil, err
+	}
+	defer db.Close()
+
+	rows, err := db.Query(
+		`SELECT id, file, servers, timeout, inserted_at, sent_at, retries, successful_server
+		 FROM queue WHERE status = ? ORDER BY id ASC`,
+		SendStatusSent,
+	)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var jobs []*SendJob
+	for rows.Next() {
+		var (
+			id               int64
+			file             string
+			serversJSON      string
+			timeout          int
+			insertedAt       int64
+			sentAt           sql.NullInt64
+			retriesJSON      string
+			successfulServer sql.NullInt64
+		)
+		if err := rows.Scan(&id, &file, &serversJSON, &timeout, &insertedAt, &sentAt, &retriesJSON, &successfulServer); err != nil {
+			return nil, err
+		}
+
+		var servers []Server
+		if err := json.Unmarshal([]byte(serversJSON), &servers); err != nil {
+			return nil, err
+		}
+		var retries []int
+		if err := json.Unmarshal([]byte(retriesJSON), &retries); err != nil {
+			return nil, err
+		}
+
+		job := &SendJob{
+			ID:         id,
+			Queue:      queue,
+			File:       file,
+			Servers:    servers,
+			Timeout:    timeout,
+			InsertedAt: time.Unix(insertedAt, 0),
+			Status:     SendStatusSent,
+			Retries:    retries,
+		}
+		if sentAt.Valid {
+			t := time.Unix(sentAt.Int64, 0)
+			job.SentAt = &t
+		}
+		if successfulServer.Valid {
+			v := int(successfulServer.Int64)
+			job.SuccessfulServer = &v
+		}
+		jobs = append(jobs, job)
+	}
+	return jobs, nil
+}
+
 // DeleteSendJob removes a row by id from the named queue.
 // If the queue is empty after deletion, the DB file is removed.
 func DeleteSendJob(storagePath, queue string, id int64) error {