Merge branch 'main' of https://github.com/foomo/redirects

foomo · Oct 23, 2023 · 7183d2e · 7183d2e
2 parents 9a0f478 + 0764249
commit 7183d2e
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 16 deletions.
diff --git a/domain/redirectdefinition/api.go b/domain/redirectdefinition/api.go
@@ -95,6 +95,6 @@ func (a *API) GetRedirects(ctx context.Context) (redirects *redirectstore.Redire
 	return a.qry.GetRedirects(ctx, a.l)
 }
 
-func (a *API) Search(ctx context.Context, qry redirectquery.Search) (redirect *redirectstore.RedirectDefinition, err error) {
+func (a *API) Search(ctx context.Context, qry redirectquery.Search) (redirect *redirectstore.RedirectDefinitions, err error) {
 	return a.qry.Search(ctx, a.l, qry)
 }
diff --git a/domain/redirectdefinition/query/search.go b/domain/redirectdefinition/query/search.go
@@ -19,15 +19,15 @@ type (
 		Source redirectstore.RedirectSource `json:"source"`
 	}
 	// SearchHandlerFn handler
-	SearchHandlerFn func(ctx context.Context, l *zap.Logger, qry Search) (*redirectstore.RedirectDefinition, error)
+	SearchHandlerFn func(ctx context.Context, l *zap.Logger, qry Search) (*redirectstore.RedirectDefinitions, error)
 	// SearchMiddlewareFn middleware
 	SearchMiddlewareFn func(next SearchHandlerFn) SearchHandlerFn
 )
 
 // SearchHandler ...
 func SearchHandler(repo *redirectrepository.RedirectsDefinitionRepository) SearchHandlerFn {
-	return func(ctx context.Context, l *zap.Logger, qry Search) (*redirectstore.RedirectDefinition, error) {
-		return repo.Find(ctx, qry.ID, string(qry.Source))
+	return func(ctx context.Context, l *zap.Logger, qry Search) (*redirectstore.RedirectDefinitions, error) {
+		return repo.FindMany(ctx, qry.ID, string(qry.Source))
 	}
 }
 
@@ -37,15 +37,15 @@ func SearchHandlerComposed(handler SearchHandlerFn, middlewares ...SearchMiddlew
 		for _, middleware := range middlewares {
 			localNext := next
 			middlewareName := strings.Split(runtime.FuncForPC(reflect.ValueOf(middleware).Pointer()).Name(), ".")[2]
-			next = middleware(func(ctx context.Context, l *zap.Logger, qry Search) (*redirectstore.RedirectDefinition, error) {
+			next = middleware(func(ctx context.Context, l *zap.Logger, qry Search) (*redirectstore.RedirectDefinitions, error) {
 				trace.SpanFromContext(ctx).AddEvent(middlewareName)
 				return localNext(ctx, l, qry)
 			})
 		}
 		return next
 	}
 	handlerName := strings.Split(runtime.FuncForPC(reflect.ValueOf(handler).Pointer()).Name(), ".")[2]
-	return composed(func(ctx context.Context, l *zap.Logger, qry Search) (*redirectstore.RedirectDefinition, error) {
+	return composed(func(ctx context.Context, l *zap.Logger, qry Search) (*redirectstore.RedirectDefinitions, error) {
 		trace.SpanFromContext(ctx).AddEvent(handlerName)
 		return handler(ctx, l, qry)
 	})

diff --git a/domain/redirectdefinition/repository/redirectdefinition.go b/domain/redirectdefinition/repository/redirectdefinition.go
@@ -7,6 +7,7 @@ import (
 
 	keelmongo "github.com/foomo/keel/persistence/mongo"
 	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.uber.org/zap"
@@ -52,6 +53,23 @@ func (rs RedirectsDefinitionRepository) Find(ctx context.Context, id, source str
 	return &result, nil
 }
 
+// TODO: DraganaB check if we need to search by id
+func (rs RedirectsDefinitionRepository) FindMany(ctx context.Context, id, source string) (*redirectstore.RedirectDefinitions, error) {
+	var result redirectstore.RedirectDefinitions
+
+	// Create a regex pattern for fuzzy match
+	pattern := primitive.Regex{Pattern: source, Options: "i"} // "i" for case-insensitive match
+
+	// Create a filter with the regex pattern
+	filter := bson.M{"source": primitive.Regex{Pattern: pattern.Pattern, Options: pattern.Options}}
+
+	findErr := rs.collection.FindOne(ctx, filter, &result)
+	if findErr != nil {
+		return nil, findErr
+	}
+	return &result, nil
+}
+
 func (rs RedirectsDefinitionRepository) FindAll(ctx context.Context) (*redirectstore.RedirectDefinitions, error) {
 	var result redirectstore.RedirectDefinitions
 	err := rs.collection.Find(ctx, bson.M{}, &result)

diff --git a/domain/redirectdefinition/service.go b/domain/redirectdefinition/service.go
@@ -42,7 +42,7 @@ func (rs *Service) GetRedirects(w http.ResponseWriter, r *http.Request) (*redire
 	return rs.api.GetRedirects(r.Context())
 }
 
-func (rs *Service) Search(w http.ResponseWriter, r *http.Request, dimension, id, path string) (*redirectstore.RedirectDefinition, error) {
+func (rs *Service) Search(w http.ResponseWriter, r *http.Request, dimension, id, path string) (*redirectstore.RedirectDefinitions, error) {
 	return rs.api.Search(r.Context(), redirectquery.Search{
 		ID:     id,
 		Source: redirectstore.RedirectSource(path),

diff --git a/domain/redirectdefinition/service/gotsrpc_gen.go b/domain/redirectdefinition/service/gotsrpc_gen.go
diff --git a/domain/redirectdefinition/service/gotsrpcclient_gen.go b/domain/redirectdefinition/service/gotsrpcclient_gen.go
diff --git a/domain/redirectdefinition/service/service.go b/domain/redirectdefinition/service/service.go
@@ -9,7 +9,7 @@ import (
 
 type RedirectDefinitionService interface {
 	CreateRedirectsFromContentserverexport(w http.ResponseWriter, r *http.Request, old, new map[string]*content.RepoNode) error
-	Search(w http.ResponseWriter, r *http.Request, dimension, id, path string) (*redirectstore.RedirectDefinition, error)
+	Search(w http.ResponseWriter, r *http.Request, dimension, id, path string) (*redirectstore.RedirectDefinitions, error)
 	Create(w http.ResponseWriter, r *http.Request, def *redirectstore.RedirectDefinition) error
 	Delete(w http.ResponseWriter, r *http.Request, path string) error
 	Update(w http.ResponseWriter, r *http.Request, def *redirectstore.RedirectDefinition) error