Don't include db-trigger maintained status groups in engine assets

core/models/assets.go

@@ -217,16 +217,21 @@ func NewOrgAssets(ctx context.Context, rt *runtime.Runtime, orgID OrgID, prev *O
  }
 
  if prev == nil || refresh&RefreshGroups > 0 {
- oa.groups, err = loadAssetType(ctx, db, orgID, "groups", loadGroups)
+ groups, err := loadAssetType(ctx, db, orgID, "groups", loadGroups)
  if err != nil {
  return nil, fmt.Errorf("error loading group assets for org %d: %w", orgID, err)
  }
- oa.groupsByID = make(map[GroupID]*Group)
- oa.groupsByUUID = make(map[assets.GroupUUID]*Group)
+ oa.groups = make([]assets.Group, 0, len(groups))
+ oa.groupsByID = make(map[GroupID]*Group, len(groups))
+ oa.groupsByUUID = make(map[assets.GroupUUID]*Group, len(groups))
  for _, g := range oa.groups {
  group := g.(*Group)
  oa.groupsByID[group.ID()] = group
  oa.groupsByUUID[group.UUID()] = group
+
+ if group.Visible() {
+ oa.groups = append(oa.groups, g)
+ }
  }
  } else {
  oa.groups = prev.groups

core/models/contacts.go

@@ -265,8 +265,8 @@ func (c *Contact) FlowContact(oa *OrgAssets) (*flows.Contact, error) {
  // convert our groups to a list of references
  groups := make([]*assets.GroupReference, 0, len(c.groups))
  for _, g := range c.groups {
- // exclude the db-trigger based status groups for now
- if g.Type() == GroupTypeManual || g.Type() == GroupTypeSmart {
+ // exclude the db-trigger based status groups
+ if g.Visible() {
  groups = append(groups, assets.NewGroupReference(g.UUID(), g.Name()))
  }
  }

core/models/groups.go

@@ -27,9 +27,12 @@ const (
 type GroupType string
 
 const (
- GroupTypeManual = GroupType("M")
- GroupTypeSmart = GroupType("Q")
- GroupTypeDBStopped = GroupType("S")
+ GroupTypeDBActive = GroupType("A")
+ GroupTypeDBBlocked = GroupType("B")
+ GroupTypeDBStopped = GroupType("S")
+ GroupTypeDBArchived = GroupType("V")
+ GroupTypeManual = GroupType("M")
+ GroupTypeSmart = GroupType("Q")
 )
 
 // Group is our mailroom type for contact groups
@@ -60,6 +63,9 @@ func (g *Group) Status() GroupStatus { return g.Status_ }
 // Type returns the type of this group
 func (g *Group) Type() GroupType { return g.Type_ }
 
+// Visible returns whether this group is visible to the engine (status groups are not)
+func (g *Group) Visible() bool { return g.Type_ == GroupTypeManual || g.Type_ == GroupTypeSmart }
+
 // loads the groups for the passed in org
 func loadGroups(ctx context.Context, db *sql.DB, orgID OrgID) ([]assets.Group, error) {
  rows, err := db.QueryContext(ctx, sqlSelectGroupsByOrg, orgID)