Merge pull request #316 from actiontech/issue-2675-5

modify: when get op permission without project id return permission from all projects
actiontech · Oct 18, 2024 · a203de6 · a203de6
2 parents abc8253 + 033d7a6
commit a203de6
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 5 deletions.
diff --git a/api/swagger.json b/api/swagger.json
@@ -1417,6 +1417,20 @@
             "description": "filter project by project id list, using in condition",
             "name": "filter_by_project_uids",
             "in": "query"
+          },
+          {
+            "enum": [
+              "high",
+              "medium",
+              "low",
+              "unknown"
+            ],
+            "type": "string",
+            "x-go-enum-desc": "high ProjectPriorityHigh\nmedium ProjectPriorityMedium\nlow ProjectPriorityLow\nunknown ProjectPriorityUnknown",
+            "x-go-name": "FilterByProjectPriority",
+            "description": "filter project by project priority\nhigh ProjectPriorityHigh\nmedium ProjectPriorityMedium\nlow ProjectPriorityLow\nunknown ProjectPriorityUnknown",
+            "name": "filter_by_project_priority",
+            "in": "query"
           }
         ],
         "responses": {

diff --git a/api/swagger.yaml b/api/swagger.yaml
@@ -5572,6 +5572,26 @@ paths:
                   name: filter_by_project_uids
                   type: array
                   x-go-name: FilterByProjectUids
+                - description: |-
+                    filter project by project priority
+                    high ProjectPriorityHigh
+                    medium ProjectPriorityMedium
+                    low ProjectPriorityLow
+                    unknown ProjectPriorityUnknown
+                  enum:
+                    - high
+                    - medium
+                    - low
+                    - unknown
+                  in: query
+                  name: filter_by_project_priority
+                  type: string
+                  x-go-enum-desc: |-
+                    high ProjectPriorityHigh
+                    medium ProjectPriorityMedium
+                    low ProjectPriorityLow
+                    unknown ProjectPriorityUnknown
+                  x-go-name: FilterByProjectPriority
             responses:
                 "200":
                     description: ListProjectReply

diff --git a/internal/dms/service/user.go b/internal/dms/service/user.go
@@ -384,11 +384,20 @@ func (d *DMSService) GetUserOpPermission(ctx context.Context, req *dmsCommonV1.G
 	}
 	permissions = append(permissions, globalPermissions...)
 
-	projectPermissions, err := d.OpPermissionVerifyUsecase.GetUserOpPermissionInProject(ctx, req.UserUid, projectUid)
-	if err != nil {
-		return nil, fmt.Errorf("get user op permission error: %v", err)
+	if projectUid != "" {
+		projectPermissions, err := d.OpPermissionVerifyUsecase.GetUserOpPermissionInProject(ctx, req.UserUid, projectUid)
+		if err != nil {
+			return nil, fmt.Errorf("get user op permission error: %v", err)
+		}
+		permissions = append(permissions, projectPermissions...)
+
+	} else {
+		projectPermissions, err := d.OpPermissionVerifyUsecase.GetUserOpPermission(ctx, req.UserUid)
+		if err != nil {
+			return nil, fmt.Errorf("get user op permission error: %v", err)
+		}
+		permissions = append(permissions, projectPermissions...)
 	}
-	permissions = append(permissions, projectPermissions...)
 
 	var replyOpPermission = make([]dmsCommonV1.OpPermissionItem, 0, len(permissions))
 	for _, p := range permissions {

diff --git a/pkg/dms-common/api/dms/v1/user.go b/pkg/dms-common/api/dms/v1/user.go
@@ -108,7 +108,7 @@ type GetUserOpPermissionReq struct {
 
 type UserOpPermission struct {
 	// uesr project uid
-	ProjectUid string `json:"project_uid" validate:"required"`
+	ProjectUid string `json:"project_uid"`
 }
 
 // swagger:model GetUserOpPermissionReply