Skip to content

armgit / posta

Public Imported from GitHub
0

Self-hosted email delivery platform that enables applications to send emails via HTTP APIs while handling SMTP delivery, templates, storage, security, and analytics. Fully self-hostable alternative to services like SendGrid or Mailgun.

fix(campaign): resolve issue where subscribers list was always empty

Jonas Kaninda65971cddf55d
diff --git a/cmd/posta/server.go b/cmd/posta/server.go
index 385418a..ea69041 100644
--- a/cmd/posta/server.go
+++ b/cmd/posta/server.go
@@ -178,6 +178,7 @@ func startEmbeddedWorker(db *gorm.DB, cfg *config.Config, blobStore blob.Store)
if blobStore != nil {
handler.SetBlobStore(blobStore)
}
+ handler.SetCampaignMessageRepo(repositories.NewCampaignMessageRepository(db))
handler.OnSent(metrics.IncrementEmailSent)
handler.OnFailed(metrics.IncrementEmailFailed)
diff --git a/cmd/posta/worker.go b/cmd/posta/worker.go
index 3e7ab55..6cc60a0 100644
--- a/cmd/posta/worker.go
+++ b/cmd/posta/worker.go
@@ -78,6 +78,7 @@ func runWorker() error {
if blobStore != nil {
handler.SetBlobStore(blobStore)
}
+ handler.SetCampaignMessageRepo(repositories.NewCampaignMessageRepository(db))
handler.OnSent(metrics.IncrementEmailSent)
handler.OnFailed(metrics.IncrementEmailFailed)
diff --git a/internal/worker/campaign_processor.go b/internal/worker/campaign_processor.go
index f6a40db..9e722af 100644
--- a/internal/worker/campaign_processor.go
+++ b/internal/worker/campaign_processor.go
@@ -109,14 +109,14 @@ func (p *CampaignProcessor) HandleCampaignStart(_ context.Context, t *asynq.Task
scope := repositories.ResourceScope{UserID: campaign.UserID, WorkspaceID: campaign.WorkspaceID}
if list.Type == models.SubscriberListTypeDynamic {
- // Dynamic list: resolve via filter rules
- subscribers, _, err = p.subscriberRepo.FindByFilterRules(scope, list.FilterRules, 0, 0)
+ // Dynamic list: resolve via filter rules (-1 means no limit in GORM)
+ subscribers, _, err = p.subscriberRepo.FindByFilterRules(scope, list.FilterRules, -1, 0)
if err != nil {
return fmt.Errorf("failed to resolve dynamic list: %w", err)
}
} else {
- // Static list: get all members
- subscribers, _, err = p.listRepo.ListMembers(list.ID, 0, 0)
+ // Static list: get all members (-1 means no limit in GORM)
+ subscribers, _, err = p.listRepo.ListMembers(list.ID, -1, 0)
if err != nil {
return fmt.Errorf("failed to list members: %w", err)
}
diff --git a/internal/worker/handler.go b/internal/worker/handler.go
index 3ab9bf3..d424a62 100644
--- a/internal/worker/handler.go
+++ b/internal/worker/handler.go
@@ -43,6 +43,7 @@ type EmailSendHandler struct {
serverRepo *repositories.ServerRepository
domainRepo *repositories.DomainRepository
contactRepo *repositories.ContactRepository
+ messageRepo *repositories.CampaignMessageRepository
sender *email.SMTPSender
dispatcher *webhook.Dispatcher
blobStore blob.Store
@@ -72,6 +73,12 @@ func NewEmailSendHandler(
// SetBlobStore sets the blob storage backend for fetching attachment content.
func (h *EmailSendHandler) SetBlobStore(bs blob.Store) { h.blobStore = bs }
+// SetCampaignMessageRepo sets the campaign message repository so that
+// campaign message statuses are updated when emails are sent or fail.
+func (h *EmailSendHandler) SetCampaignMessageRepo(r *repositories.CampaignMessageRepository) {
+ h.messageRepo = r
+}
+
// OnSent sets a callback invoked after each successful email send.
func (h *EmailSendHandler) OnSent(fn func()) { h.onSent = fn }
@@ -224,6 +231,11 @@ func (h *EmailSendHandler) ProcessTask(ctx context.Context, t *asynq.Task) error
if h.contactRepo != nil {
go h.contactRepo.RecordSent(em.UserID, em.WorkspaceID, em.Recipients)
}
+ if h.messageRepo != nil {
+ if msg, err := h.messageRepo.FindByEmailID(em.ID); err == nil {
+ _ = h.messageRepo.UpdateStatus(msg.ID, models.CampaignMsgSent, "")
+ }
+ }
logger.Info("worker: email sent successfully", "id", em.ID)
return nil
@@ -243,6 +255,11 @@ func (h *EmailSendHandler) markFailed(em *models.Email, reason string, sharedSer
if h.contactRepo != nil {
go h.contactRepo.RecordFailed(em.UserID, em.WorkspaceID, em.Recipients)
}
+ if h.messageRepo != nil {
+ if msg, err := h.messageRepo.FindByEmailID(em.ID); err == nil {
+ _ = h.messageRepo.UpdateStatus(msg.ID, models.CampaignMsgFailed, reason)
+ }
+ }
}
// senderDomain extracts the domain part of an email address.