From fd31ac6f582c98f799a7cc8b5addfd114197c82c Mon Sep 17 00:00:00 2001 From: Kailash Nadh Date: Sun, 19 Jan 2025 16:06:39 +0530 Subject: [PATCH] Remove redundant `send_later` param in campaign POST/PUT. --- cmd/campaigns.go | 5 +---- frontend/src/views/Campaign.vue | 2 -- internal/core/campaigns.go | 4 +++- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cmd/campaigns.go b/cmd/campaigns.go index aa09022d..468dc91e 100644 --- a/cmd/campaigns.go +++ b/cmd/campaigns.go @@ -24,9 +24,6 @@ import ( type campaignReq struct { models.Campaign - // Indicates if the "send_at" date should be written or set to null. - SendLater bool `json:"send_later"` - // This overrides Campaign.Lists to receive and // write a list of int IDs during creation and updation. // Campaign.Lists is JSONText for sending lists children @@ -269,7 +266,7 @@ func handleUpdateCampaign(c echo.Context) error { o = c } - out, err := app.core.UpdateCampaign(id, o.Campaign, o.ListIDs, o.MediaIDs, o.SendLater) + out, err := app.core.UpdateCampaign(id, o.Campaign, o.ListIDs, o.MediaIDs) if err != nil { return err } diff --git a/frontend/src/views/Campaign.vue b/frontend/src/views/Campaign.vue index d8f5f91a..7fd7893d 100644 --- a/frontend/src/views/Campaign.vue +++ b/frontend/src/views/Campaign.vue @@ -497,7 +497,6 @@ export default Vue.extend({ messenger: this.form.messenger, type: 'regular', tags: this.form.tags, - send_later: this.form.sendLater, send_at: this.form.sendLater ? this.form.sendAtDate : null, headers: this.form.headers, template_id: this.form.templateId, @@ -521,7 +520,6 @@ export default Vue.extend({ messenger: this.form.messenger, type: 'regular', tags: this.form.tags, - send_later: this.form.sendLater, send_at: this.form.sendLater ? this.form.sendAtDate : null, headers: this.form.headers, template_id: this.form.templateId, diff --git a/internal/core/campaigns.go b/internal/core/campaigns.go index 168583e7..f54dda23 100644 --- a/internal/core/campaigns.go +++ b/internal/core/campaigns.go @@ -208,7 +208,9 @@ func (c *Core) CreateCampaign(o models.Campaign, listIDs []int, mediaIDs []int) } // UpdateCampaign updates a campaign. -func (c *Core) UpdateCampaign(id int, o models.Campaign, listIDs []int, mediaIDs []int, sendLater bool) (models.Campaign, error) { +func (c *Core) UpdateCampaign(id int, o models.Campaign, listIDs []int, mediaIDs []int) (models.Campaign, error) { + sendLater := o.SendAt.Valid + _, err := c.q.UpdateCampaign.Exec(id, o.Name, o.Subject,