refactor(api): use multiple $match stages in aggregation pipelines

- Refactor DeviceResolve and UserResolve to use pipeline-based query
  building
- Change query options to append individual $match stages instead of
  modifying single match object
- Move options processing after pipeline initialization to allow dynamic
  $match injection
- Leverage MongoDB's automatic optimization of consecutive $match stages
  for better performance

Author: heiytor

api/store/mongo/device.go

@@ -163,12 +163,6 @@ func (s *Store) DeviceResolve(ctx context.Context, resolver store.DeviceResolver
 		matchStage["identity"] = bson.M{"mac": value}
 	}
 
-	for _, opt := range opts {
-		if err := opt(context.WithValue(ctx, "query", &matchStage)); err != nil {
-			return nil, err
-		}
-	}
-
 	query := []bson.M{
 		{
 			"$match": matchStage,
@@ -207,6 +201,12 @@ func (s *Store) DeviceResolve(ctx context.Context, resolver store.DeviceResolver
 		},
 	}
 
+	for _, opt := range opts {
+		if err := opt(context.WithValue(ctx, "query", &query)); err != nil {
+			return nil, err
+		}
+	}
+
 	cursor, err := s.db.Collection("devices").Aggregate(ctx, query)
 	if err != nil {
 		return nil, FromMongoError(err)

api/store/mongo/query-options.go

@@ -15,25 +15,33 @@ func (s *Store) Options() store.QueryOptions {
 
 func (*queryOptions) InNamespace(tenantID string) store.QueryOption {
 	return func(ctx context.Context) error {
-		query, ok := ctx.Value("query").(*bson.M)
+		query, ok := ctx.Value("query").(*[]bson.M)
 		if !ok {
 			return errors.New("query not found in context")
 		}
 
-		(*query)["tenant_id"] = tenantID
+		*query = append(*query, bson.M{
+			"$match": bson.M{
+				"tenant_id": tenantID,
+			},
+		})
 
 		return nil
 	}
 }
 
 func (*queryOptions) WithDeviceStatus(status models.DeviceStatus) store.QueryOption {
 	return func(ctx context.Context) error {
-		query, ok := ctx.Value("query").(*bson.M)
+		query, ok := ctx.Value("query").(*[]bson.M)
 		if !ok {
 			return errors.New("query not found in context")
 		}
 
-		(*query)["status"] = status
+		*query = append(*query, bson.M{
+			"$match": bson.M{
+				"status": status,
+			},
+		})
 
 		return nil
 	}

api/store/mongo/user.go

@@ -121,13 +121,14 @@ func (s *Store) UserResolve(ctx context.Context, resolver store.UserResolver, va
 		matchStage["username"] = value
 	}
 
+	query := []bson.M{{"$match": matchStage}}
 	for _, opt := range opts {
-		if err := opt(context.WithValue(ctx, "query", &matchStage)); err != nil {
+		if err := opt(context.WithValue(ctx, "query", &query)); err != nil {
 			return nil, err
 		}
 	}
 
-	cursor, err := s.db.Collection("users").Aggregate(ctx, []bson.M{{"$match": matchStage}})
+	cursor, err := s.db.Collection("users").Aggregate(ctx, query)
 	if err != nil {
 		return nil, FromMongoError(err)
 	}