Merge pull request #341 from actiontech/add-filter

Add filter to filter project by desc
actiontech · Dec 20, 2024 · 9488d99 · 9488d99
2 parents 1155b51 + eea1753
commit 9488d99
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/api/swagger.json b/api/swagger.json
@@ -1442,6 +1442,13 @@
             "description": "filter project by project priority\nhigh ProjectPriorityHigh\nmedium ProjectPriorityMedium\nlow ProjectPriorityLow\nunknown ProjectPriorityUnknown",
             "name": "filter_by_project_priority",
             "in": "query"
+          },
+          {
+            "type": "string",
+            "x-go-name": "FilterByDesc",
+            "description": "filter the Project By Project description",
+            "name": "filter_by_desc",
+            "in": "query"
           }
         ],
         "responses": {
@@ -5151,6 +5158,10 @@
     "BindOauth2UserReq": {
       "type": "object",
       "properties": {
+        "id_token": {
+          "type": "string",
+          "x-go-name": "IdToken"
+        },
         "oauth2_token": {
           "type": "string",
           "x-go-name": "Oauth2Token"
@@ -9679,7 +9690,7 @@
           "x-go-name": "Uid"
         }
       },
-      "x-go-package": "github.com/actiontech/dms/pkg/dms-common/api/dms/v1"
+      "x-go-package": "github.com/actiontech/dms/api/dms/service/v1"
     },
     "UpdateCompanyNotice": {
       "description": "A companynotice",

diff --git a/api/swagger.yaml b/api/swagger.yaml
@@ -456,6 +456,9 @@ definitions:
         x-go-package: github.com/actiontech/dms/api/dms/service/v1
     BindOauth2UserReq:
         properties:
+            id_token:
+                type: string
+                x-go-name: IdToken
             oauth2_token:
                 type: string
                 x-go-name: Oauth2Token
@@ -4082,7 +4085,7 @@ definitions:
                 type: string
                 x-go-name: Uid
         type: object
-        x-go-package: github.com/actiontech/dms/pkg/dms-common/api/dms/v1
+        x-go-package: github.com/actiontech/dms/api/dms/service/v1
     UpdateCompanyNotice:
         description: A companynotice
         properties:
@@ -5711,6 +5714,11 @@ paths:
                     low ProjectPriorityLow
                     unknown ProjectPriorityUnknown
                   x-go-name: FilterByProjectPriority
+                - description: filter the Project By Project description
+                  in: query
+                  name: filter_by_desc
+                  type: string
+                  x-go-name: FilterByDesc
             responses:
                 "200":
                     description: ListProjectReply

diff --git a/internal/dms/biz/repo_fields.go b/internal/dms/biz/repo_fields.go
diff --git a/internal/dms/service/project.go b/internal/dms/service/project.go
@@ -51,7 +51,15 @@ func (d *DMSService) ListProjects(ctx context.Context, req *dmsCommonV1.ListProj
 			Operator: pkgConst.FilterOperatorIn,
 			Value:    req.FilterByProjectUids,
 		})
+	}	
+	if req.FilterByDesc != "" {
+		filterBy = append(filterBy, pkgConst.FilterCondition{
+			Field:    string(biz.ProjectFieldDesc),
+			Operator: pkgConst.FilterOperatorContains,
+			Value:    req.FilterByDesc,
+		})
 	}
+
 	listOption := &biz.ListProjectsOption{
 		PageNumber:   req.PageIndex,
 		LimitPerPage: req.PageSize,

diff --git a/pkg/dms-common/api/dms/v1/project.go b/pkg/dms-common/api/dms/v1/project.go
@@ -28,6 +28,8 @@ type ListProjectReq struct {
 	// filter project by project priority
 	// in:query
 	FilterByProjectPriority ProjectPriority `query:"filter_by_project_priority" json:"filter_by_project_priority"`
+	// filter the Project By Project description
+	FilterByDesc string `query:"filter_by_desc" json:"filter_by_desc"`
 }
 
 // swagger:enum ProjectOrderByField