modified search

Author: sp20ks

internal/delivery/handlers/sight/sight.go

@@ -28,9 +28,7 @@ func NewSightsHandler(usecase usecase.SightUseCaseInterface) *SightHandler {
 // @Success 200 {array} sight.Sight
 // @Router /sights [get]
 func (h *SightHandler) GetSights(ctx context.Context, _ entities.Sight) (entities.Sights, error) {
-	params := httputils.GetQueryParamsFromCtx(ctx)
-	categoryID, _ := strconv.Atoi(params["category_id"])
-	sights, err := h.SightUseCase.GetSightsList(categoryID)
+	sights, err := h.SightUseCase.GetSightsList()
 	if err != nil {
 		return entities.Sights{}, err
 	}
@@ -62,8 +60,8 @@ func (h *SightHandler) GetSight(ctx context.Context, _ entities.Sight) (entities
 	return entities.SightComments{Sight: sight, Comms: comments}, nil
 }
 
-func (h *SightHandler) SearchSights(_ context.Context, requestData entities.Sight) (entities.Sights, error) {
-	sights, err := h.SightUseCase.SearchSights(requestData.Name)
+func (h *SightHandler) SearchSights(ctx context.Context, requestData entities.Sight) (entities.Sights, error) {
+	sights, err := h.SightUseCase.SearchSights(httputils.GetQueryParamsFromCtx(ctx))
 	if err != nil {
 		return entities.Sights{}, err
 	}

internal/storage/postgres/sight/sight_storage.go

@@ -3,6 +3,7 @@ package sight
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/go-park-mail-ru/2024_1_ResCogitans/internal/entities"
 	storage "github.com/go-park-mail-ru/2024_1_ResCogitans/internal/storage/storage_interfaces"
@@ -24,7 +25,7 @@ func NewSightStorage(db *pgxpool.Pool) storage.SightStorageInterface {
 	}
 }
 
-func (ss *SightStorage) GetSightsList(categoryID int) ([]entities.Sight, error) {
+func (ss *SightStorage) GetSightsList() ([]entities.Sight, error) {
 	var sights []*entities.Sight
 	ctx := context.Background()
 
@@ -40,13 +41,7 @@ func (ss *SightStorage) GetSightsList(categoryID int) ([]entities.Sight, error)
 		INNER JOIN image_data AS im 
 			ON sight.id = im.sight_id`
 
-	args := make([]interface{}, 0)
-	if categoryID != 0 {
-		query += ` WHERE category_id = $1`
-		args = append(args, categoryID)
-	}
-
-	err := pgxscan.Select(ctx, ss.db, &sights, query, args...)
+	err := pgxscan.Select(ctx, ss.db, &sights, query)
 	if err != nil {
 		logger.Logger().Error(err.Error())
 		return nil, err
@@ -92,13 +87,25 @@ func (ss *SightStorage) GetSight(id int) (entities.Sight, error) {
 	return *sight[0], nil
 }
 
-func (ss *SightStorage) SearchSights(str string) (entities.Sights, error) {
-	query := `
-        SELECT id, rating, name, description, city_id, country_id
-        FROM sight
-        WHERE LOWER(name) LIKE LOWER($1)
-    `
-	rows, err := ss.db.Query(context.Background(), query, "%"+str+"%")
+func (ss *SightStorage) SearchSights(searchParams map[string]string) (entities.Sights, error) {
+	var query strings.Builder
+	query.WriteString("SELECT id, rating, name, description, city_id, country_id, category_id FROM sight WHERE ")
+
+	first := true
+	for key, value := range searchParams {
+		if !first {
+			query.WriteString(" AND ")
+		} else {
+			first = false
+		}
+		if key == "rating" || key == "city_id" || key == "country_id" || key == "category_id" {
+			query.WriteString(fmt.Sprintf("%s = %s", key, value))
+		} else {
+			query.WriteString(fmt.Sprintf("LOWER(%s) LIKE LOWER('%%%s%%')", key, value))
+		}
+	}
+
+	rows, err := ss.db.Query(context.Background(), query.String())
 	if err != nil {
 		return entities.Sights{}, err
 	}
@@ -107,7 +114,7 @@ func (ss *SightStorage) SearchSights(str string) (entities.Sights, error) {
 	var sights entities.Sights
 	for rows.Next() {
 		var sight entities.Sight
-		err := rows.Scan(&sight.ID, &sight.Rating, &sight.Name, &sight.Description, &sight.CityID, &sight.CountryID)
+		err := rows.Scan(&sight.ID, &sight.Rating, &sight.Name, &sight.Description, &sight.CityID, &sight.CountryID, &sight.CategoryID)
 		if err != nil {
 			return entities.Sights{}, err
 		}

internal/storage/storage_interfaces/sight_interface.go

@@ -5,9 +5,9 @@ import (
 )
 
 type SightStorageInterface interface {
-	GetSightsList(categoryID int) ([]entities.Sight, error)
+	GetSightsList() ([]entities.Sight, error)
 	GetSight(sightID int) (entities.Sight, error)
-	SearchSights(str string) (entities.Sights, error)
+	SearchSights(searchParams map[string]string) (entities.Sights, error)
 	GetCommentsBySightID(commentID int) ([]entities.Comment, error)
 	GetCommentsByUserID(userID int) ([]entities.Comment, error)
 	CreateCommentBySightID(sightID int, comment entities.Comment) error

internal/usecase/sight_usecase.go

@@ -9,8 +9,8 @@ type SightUseCaseInterface interface {
 	GetSightByID(sightID int) (entities.Sight, error)
 	GetCommentsBySightID(commentID int) ([]entities.Comment, error)
 	GetCommentsByUserID(userID int) ([]entities.Comment, error)
-	GetSightsList(categoryID int) ([]entities.Sight, error)
-	SearchSights(str string) (entities.Sights, error)
+	GetSightsList() ([]entities.Sight, error)
+	SearchSights(searchParams map[string]string) (entities.Sights, error)
 }
 
 type SightUseCase struct {
@@ -35,10 +35,10 @@ func (su *SightUseCase) GetCommentsByUserID(userID int) ([]entities.Comment, err
 	return su.SightStorage.GetCommentsByUserID(userID)
 }
 
-func (su *SightUseCase) GetSightsList(categoryID int) ([]entities.Sight, error) {
-	return su.SightStorage.GetSightsList(categoryID)
+func (su *SightUseCase) GetSightsList() ([]entities.Sight, error) {
+	return su.SightStorage.GetSightsList()
 }
 
-func (su *SightUseCase) SearchSights(str string) (entities.Sights, error) {
-	return su.SightStorage.SearchSights(str)
+func (su *SightUseCase) SearchSights(searchParams map[string]string) (entities.Sights, error) {
+	return su.SightStorage.SearchSights(searchParams)
 }