fix: enable rule and attachments count

ItsNotGoodName · Jul 20, 2023 · da486b8 · da486b8
1 parent 5dab096
commit da486b8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/internal/db/envelope.go b/internal/db/envelope.go
@@ -114,7 +114,7 @@ func EnvelopeCount(cc *core.Context) (int, error) {
 }
 
 func EnvelopeAttachmentCount(cc *core.Context) (int, error) {
-	return cc.DB.NewSelect().Model(&envelope.Attachment{}).Where("message_id != NULL").Count(cc.Context())
+	return cc.DB.NewSelect().Model(&envelope.Attachment{}).Where("message_id IS NOT NULL").Count(cc.Context())
 }
 
 func EnvelopeAttachmentList(cc *core.Context, page pagination.Page, filter envelope.AttachmentFilter) (envelope.AttachmentListResult, error) {

diff --git a/internal/db/rules.go b/internal/db/rules.go
@@ -11,6 +11,12 @@ func RuleList(cc *core.Context) ([]rules.Rule, error) {
 	return rrules, err
 }
 
+func RuleListEnable(cc *core.Context) ([]rules.Rule, error) {
+	var rrules []rules.Rule
+	err := cc.DB.NewSelect().Model(&rrules).Where("enable = TRUE").Scan(cc.Context())
+	return rrules, err
+}
+
 func RuleEndpointList(cc *core.Context, ruleID int64) ([]rules.Endpoint, error) {
 	var e []rules.Endpoint
 	err := cc.DB.NewSelect().

diff --git a/internal/procs/mailman.go b/internal/procs/mailman.go
@@ -39,7 +39,7 @@ func mailman(cc *core.Context, evtC <-chan core.EventEnvelopeCreated) {
 			}
 
 			// List all rules
-			rrules, err := db.RuleList(cc)
+			rrules, err := db.RuleListEnable(cc)
 			if err != nil {
 				log.Err(err).Msg("Failed to list rules from database")
 				continue

diff --git a/internal/rules/rules.go b/internal/rules/rules.go
@@ -19,7 +19,6 @@ type CreateRule struct {
 	InternalID string
 	Name       string
 	Template   string
-	Enable     bool
 }
 
 type Rule struct {