From a28dcc5df8b9b3054b80528322c993123eb5af3c Mon Sep 17 00:00:00 2001 From: Andrew Walter Date: Sun, 10 Dec 2023 10:21:15 +1100 Subject: [PATCH] Persist Campaign Group assignments on campaign creation --- .../20231210085739_add_campaigns_groups.sql | 10 +++++ .../20231210085739_add_campaigns_groups.sql | 10 +++++ models/campaign.go | 42 ++++++++++++++++++- 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 db/db_mysql/migrations/20231210085739_add_campaigns_groups.sql create mode 100644 db/db_sqlite3/migrations/20231210085739_add_campaigns_groups.sql diff --git a/db/db_mysql/migrations/20231210085739_add_campaigns_groups.sql b/db/db_mysql/migrations/20231210085739_add_campaigns_groups.sql new file mode 100644 index 00000000..f8192405 --- /dev/null +++ b/db/db_mysql/migrations/20231210085739_add_campaigns_groups.sql @@ -0,0 +1,10 @@ +-- +goose Up +-- +goose StatementBegin +CREATE TABLE IF NOT EXISTS `campaign_groups` (campaign_id bigint,group_id bigint ); +CREATE UNIQUE INDEX IF NOT EXISTS uniqueCampaignIdGroupId ON campaign_groups (campaign_id, group_id); +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +DROP TABLE `campaign_groups`; +-- +goose StatementEnd diff --git a/db/db_sqlite3/migrations/20231210085739_add_campaigns_groups.sql b/db/db_sqlite3/migrations/20231210085739_add_campaigns_groups.sql new file mode 100644 index 00000000..f8192405 --- /dev/null +++ b/db/db_sqlite3/migrations/20231210085739_add_campaigns_groups.sql @@ -0,0 +1,10 @@ +-- +goose Up +-- +goose StatementBegin +CREATE TABLE IF NOT EXISTS `campaign_groups` (campaign_id bigint,group_id bigint ); +CREATE UNIQUE INDEX IF NOT EXISTS uniqueCampaignIdGroupId ON campaign_groups (campaign_id, group_id); +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +DROP TABLE `campaign_groups`; +-- +goose StatementEnd diff --git a/models/campaign.go b/models/campaign.go index c091752f..5bd97542 100644 --- a/models/campaign.go +++ b/models/campaign.go @@ -71,6 +71,12 @@ type CampaignStats struct { Error int64 `json:"error"` } +// CampaignGroup is used for a many-to-many relationship between 1..* Campaigns and 1..* Groups +type CampaignGroup struct { + CampaignId int64 `json:"-"` + GroupId int64 `json:"-"` +} + // Event contains the fields for an event // that occurs during the campaign type Event struct { @@ -527,15 +533,34 @@ func PostCampaign(c *Campaign, uid int64) error { c.SMTP = s c.SMTPId = s.Id // Insert into the DB - err = db.Save(c).Error + tx := db.Begin() + err = tx.Save(c).Error + if err != nil { + log.Error(err) + tx.Rollback() + return err + } + + // Add the associated groups to the Campaign's group assignments + for _, g := range c.Groups { + err = InsertGroupIntoCampaign(tx, g.Id, c) + if err != nil { + log.Error(err) + return err + } + } + + err = tx.Commit().Error if err != nil { log.Error(err) return err } + err = AddEvent(&Event{Message: "Campaign Created"}, c.Id) if err != nil { log.Error(err) } + // Import the users return UpdateUsers(c, totalRecipients) } @@ -673,4 +698,19 @@ func UpdateUsers(c *Campaign, totalRecipients int) error { } return tx.Commit().Error +} + +// InsertGroupIntoCampaign inserts the specified group into the Campaign's group assignments. +func InsertGroupIntoCampaign(tx *gorm.DB, gid int64, c *Campaign) error { + // ToDo: Handle duplicate entries + + err := tx.Save(&CampaignGroup{CampaignId: c.Id, GroupId: gid}).Error + + if err != nil { + log.Error(err) + tx.Rollback() + return err + } + + return nil } \ No newline at end of file