Merge pull request #69 from moevm/back-addition-1

Added searching by description
moevm · Dec 12, 2024 · 39b7e8f · 39b7e8f
2 parents 53d0a97 + b8a44d8
commit 39b7e8f
Show file tree

Hide file tree

Showing 13 changed files with 309 additions and 288 deletions.
diff --git a/server/api/plants/v1/plants.proto b/server/api/plants/v1/plants.proto
@@ -170,6 +170,7 @@ message GetPlantsWithCareRulesV1Request {
         string type = 2;
         repeated string lightCondition = 3;
         repeated string temperatureRegime = 4;
+        string description = 5;
     }
     Filter filter = 1;
     int64 page = 2;

diff --git a/server/gen/docs/data/v1/data.swagger.json b/server/gen/docs/data/v1/data.swagger.json
@@ -21,18 +21,9 @@
         "operationId": "DataAPI_ExportDBV1",
         "responses": {
           "200": {
-            "description": "A successful response.(streaming responses)",
+            "description": "A successful response.",
             "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "$ref": "#/definitions/v1ExportDBV1Response"
-                },
-                "error": {
-                  "$ref": "#/definitions/rpcStatus"
-                }
-              },
-              "title": "Stream result of v1ExportDBV1Response"
+              "$ref": "#/definitions/v1ExportDBV1Response"
             }
           },
           "default": {
@@ -65,7 +56,6 @@
         "parameters": [
           {
             "name": "body",
-            "description": " (streaming inputs)",
             "in": "body",
             "required": true,
             "schema": {

diff --git a/server/gen/docs/plants/v1/plants.swagger.json b/server/gen/docs/plants/v1/plants.swagger.json
@@ -832,6 +832,12 @@
         "createdAt": {
           "type": "string",
           "format": "date-time"
+        },
+        "id": {
+          "type": "string"
+        },
+        "image": {
+          "type": "string"
         }
       }
     },
@@ -871,6 +877,9 @@
           "items": {
             "type": "string"
           }
+        },
+        "description": {
+          "type": "string"
         }
       }
     },

diff --git a/server/internal/handlers/plants/get_plants_with_care_rules_v1.go b/server/internal/handlers/plants/get_plants_with_care_rules_v1.go
@@ -31,6 +31,9 @@ func (h *Handler) GetPlantsWithCareRulesV1(
 	if len(req.Filter.TemperatureRegime) != 0 {
 		filter.Labels["temperature_regime"] = req.Filter.TemperatureRegime
 	}
+	if req.Filter.Description != "" {
+		filter.Labels["description"] = req.Filter.Description
+	}
 	rules, count, err := h.storage.GetPlantsWithCareRules(ctx, filter)
 	if err != nil {
 		return nil, status.Error(codes.Internal, "internal error occured")

diff --git a/server/internal/pkg/pb/data/v1/data.pb.go b/server/internal/pkg/pb/data/v1/data.pb.go
diff --git a/server/internal/pkg/pb/data/v1/data_grpc.pb.go b/server/internal/pkg/pb/data/v1/data_grpc.pb.go
diff --git a/server/internal/pkg/pb/plants/v1/plants.pb.go b/server/internal/pkg/pb/plants/v1/plants.pb.go
diff --git a/server/internal/pkg/pb/plants/v1/plants_grpc.pb.go b/server/internal/pkg/pb/plants/v1/plants_grpc.pb.go
diff --git a/server/internal/pkg/pb/trades/v1/trades.pb.go b/server/internal/pkg/pb/trades/v1/trades.pb.go
diff --git a/server/internal/pkg/pb/trades/v1/trades_grpc.pb.go b/server/internal/pkg/pb/trades/v1/trades_grpc.pb.go
diff --git a/server/internal/pkg/pb/users/v1/users.pb.go b/server/internal/pkg/pb/users/v1/users.pb.go
diff --git a/server/internal/pkg/pb/users/v1/users_grpc.pb.go b/server/internal/pkg/pb/users/v1/users_grpc.pb.go
diff --git a/server/internal/storage/plants.go b/server/internal/storage/plants.go
@@ -18,7 +18,15 @@ type valsType interface {
 
 func (s *Storage) GetPlantsWithCareRules(ctx context.Context, fltr *models.Filter) ([]*models.CareRules, int64, error) {
 	collection := s.DataBase.Collection("care_rules")
-	filter := parseLabelsToBSON(fltr.Labels)
+	filter := primitive.D{}
+	if v, ok := fltr.Labels["description"]; ok {
+		filter = append(filter, bson.E{
+			Key: "description", Value: bson.M{"$elemMatch": bson.M{"description_addition": bson.M{"$regex": v, "$options": "i"}}},
+		},
+		)
+		delete(fltr.Labels, "description")
+	}
+	filter = append(filter, parseLabelsToBSON(fltr.Labels)...)
 	opts := options.Find()
 	opts.SetLimit(fltr.Size)
 	opts.SetSkip((fltr.Page - 1) * fltr.Size)