From e3582338bca41a0763777e595851c565dab0837c Mon Sep 17 00:00:00 2001 From: xwzQmxx <1499273991@qq.com> Date: Fri, 3 Dec 2021 10:18:55 +0800 Subject: [PATCH 1/3] update permissions string to struct --- api/swagger.yaml | 9 ++++++++- docs/Permission.md | 11 +++++++++++ docs/ProjectMember.md | 2 +- gitee/model_permission.go | 15 +++++++++++++++ gitee/model_project_member.go | 36 +++++++++++++++++------------------ 5 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 docs/Permission.md create mode 100644 gitee/model_permission.go diff --git a/api/swagger.yaml b/api/swagger.yaml index dbb16ac..134b1e2 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -14281,7 +14281,7 @@ definitions: site_admin: type: "string" permissions: - type: "string" + $ref: "#/definitions/Permission" description: "添加仓库成员" example: gists_url: "gists_url" @@ -16652,3 +16652,10 @@ definitions: testers: "testtesters" assignees_number: 0 testers_number: 0 + Permission: + type: "object" + properties: + pull: + type: "boolean" + push: + type: "boolean" \ No newline at end of file diff --git a/docs/Permission.md b/docs/Permission.md new file mode 100644 index 0000000..e0f9b50 --- /dev/null +++ b/docs/Permission.md @@ -0,0 +1,11 @@ +# Permission + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**Pull** | **bool** | | [optional] [default to null] +**Push** | **bool** | | [optional] [default to null] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/docs/ProjectMember.md b/docs/ProjectMember.md index 8b343c3..c5a45ea 100644 --- a/docs/ProjectMember.md +++ b/docs/ProjectMember.md @@ -20,7 +20,7 @@ Name | Type | Description | Notes **ReceivedEventsUrl** | **string** | | [optional] [default to null] **Type_** | **string** | | [optional] [default to null] **SiteAdmin** | **string** | | [optional] [default to null] -**Permissions** | **string** | | [optional] [default to null] +**Permissions** | [***Permission**](Permission.md) | | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/gitee/model_permission.go b/gitee/model_permission.go new file mode 100644 index 0000000..fce90c0 --- /dev/null +++ b/gitee/model_permission.go @@ -0,0 +1,15 @@ +/* + * 码云 Open API + * + * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen) + * + * API version: 5.3.2 + * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git) + */ + +package gitee + +type Permission struct { + Pull bool `json:"pull,omitempty"` + Push bool `json:"push,omitempty"` +} diff --git a/gitee/model_project_member.go b/gitee/model_project_member.go index a71df93..e8b58cb 100644 --- a/gitee/model_project_member.go +++ b/gitee/model_project_member.go @@ -11,22 +11,22 @@ package gitee // 添加仓库成员 type ProjectMember struct { - Id int32 `json:"id,omitempty"` - Login string `json:"login,omitempty"` - Name string `json:"name,omitempty"` - AvatarUrl string `json:"avatar_url,omitempty"` - Url string `json:"url,omitempty"` - HtmlUrl string `json:"html_url,omitempty"` - FollowersUrl string `json:"followers_url,omitempty"` - FollowingUrl string `json:"following_url,omitempty"` - GistsUrl string `json:"gists_url,omitempty"` - StarredUrl string `json:"starred_url,omitempty"` - SubscriptionsUrl string `json:"subscriptions_url,omitempty"` - OrganizationsUrl string `json:"organizations_url,omitempty"` - ReposUrl string `json:"repos_url,omitempty"` - EventsUrl string `json:"events_url,omitempty"` - ReceivedEventsUrl string `json:"received_events_url,omitempty"` - Type_ string `json:"type,omitempty"` - SiteAdmin string `json:"site_admin,omitempty"` - Permissions string `json:"permissions,omitempty"` + Id int32 `json:"id,omitempty"` + Login string `json:"login,omitempty"` + Name string `json:"name,omitempty"` + AvatarUrl string `json:"avatar_url,omitempty"` + Url string `json:"url,omitempty"` + HtmlUrl string `json:"html_url,omitempty"` + FollowersUrl string `json:"followers_url,omitempty"` + FollowingUrl string `json:"following_url,omitempty"` + GistsUrl string `json:"gists_url,omitempty"` + StarredUrl string `json:"starred_url,omitempty"` + SubscriptionsUrl string `json:"subscriptions_url,omitempty"` + OrganizationsUrl string `json:"organizations_url,omitempty"` + ReposUrl string `json:"repos_url,omitempty"` + EventsUrl string `json:"events_url,omitempty"` + ReceivedEventsUrl string `json:"received_events_url,omitempty"` + Type_ string `json:"type,omitempty"` + SiteAdmin string `json:"site_admin,omitempty"` + Permissions *Permission `json:"permissions,omitempty"` } -- Gitee From 9d54557ac9999a07c4e8d02d1ab2183e1957609a Mon Sep 17 00:00:00 2001 From: xwzQmxx <1499273991@qq.com> Date: Fri, 3 Dec 2021 10:39:36 +0800 Subject: [PATCH 2/3] fix review --- api/swagger.yaml | 6 ++-- docs/ProjectMember.md | 2 +- ...on.md => ProjectMemberPermissionDetail.md} | 3 +- gitee/model_project_member.go | 36 +++++++++---------- ...model_project_member_permission_detail.go} | 3 +- 5 files changed, 27 insertions(+), 23 deletions(-) rename docs/{Permission.md => ProjectMemberPermissionDetail.md} (81%) rename gitee/{model_permission.go => model_project_member_permission_detail.go} (80%) diff --git a/api/swagger.yaml b/api/swagger.yaml index 134b1e2..8477790 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -14281,7 +14281,7 @@ definitions: site_admin: type: "string" permissions: - $ref: "#/definitions/Permission" + $ref: "#/definitions/ProjectMemberPermissionDetail" description: "添加仓库成员" example: gists_url: "gists_url" @@ -16652,10 +16652,12 @@ definitions: testers: "testtesters" assignees_number: 0 testers_number: 0 - Permission: + ProjectMemberPermissionDetail: type: "object" properties: pull: type: "boolean" push: + type: "boolean" + admin: type: "boolean" \ No newline at end of file diff --git a/docs/ProjectMember.md b/docs/ProjectMember.md index c5a45ea..b11fc84 100644 --- a/docs/ProjectMember.md +++ b/docs/ProjectMember.md @@ -20,7 +20,7 @@ Name | Type | Description | Notes **ReceivedEventsUrl** | **string** | | [optional] [default to null] **Type_** | **string** | | [optional] [default to null] **SiteAdmin** | **string** | | [optional] [default to null] -**Permissions** | [***Permission**](Permission.md) | | [optional] [default to null] +**Permissions** | [***ProjectMemberPermissionDetail**](ProjectMemberPermissionDetail.md) | | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/docs/Permission.md b/docs/ProjectMemberPermissionDetail.md similarity index 81% rename from docs/Permission.md rename to docs/ProjectMemberPermissionDetail.md index e0f9b50..b27d5c8 100644 --- a/docs/Permission.md +++ b/docs/ProjectMemberPermissionDetail.md @@ -1,10 +1,11 @@ -# Permission +# ProjectMemberPermissionDetail ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **Pull** | **bool** | | [optional] [default to null] **Push** | **bool** | | [optional] [default to null] +**Admin** | **bool** | | [optional] [default to null] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/gitee/model_project_member.go b/gitee/model_project_member.go index e8b58cb..b37c5f0 100644 --- a/gitee/model_project_member.go +++ b/gitee/model_project_member.go @@ -11,22 +11,22 @@ package gitee // 添加仓库成员 type ProjectMember struct { - Id int32 `json:"id,omitempty"` - Login string `json:"login,omitempty"` - Name string `json:"name,omitempty"` - AvatarUrl string `json:"avatar_url,omitempty"` - Url string `json:"url,omitempty"` - HtmlUrl string `json:"html_url,omitempty"` - FollowersUrl string `json:"followers_url,omitempty"` - FollowingUrl string `json:"following_url,omitempty"` - GistsUrl string `json:"gists_url,omitempty"` - StarredUrl string `json:"starred_url,omitempty"` - SubscriptionsUrl string `json:"subscriptions_url,omitempty"` - OrganizationsUrl string `json:"organizations_url,omitempty"` - ReposUrl string `json:"repos_url,omitempty"` - EventsUrl string `json:"events_url,omitempty"` - ReceivedEventsUrl string `json:"received_events_url,omitempty"` - Type_ string `json:"type,omitempty"` - SiteAdmin string `json:"site_admin,omitempty"` - Permissions *Permission `json:"permissions,omitempty"` + Id int32 `json:"id,omitempty"` + Login string `json:"login,omitempty"` + Name string `json:"name,omitempty"` + AvatarUrl string `json:"avatar_url,omitempty"` + Url string `json:"url,omitempty"` + HtmlUrl string `json:"html_url,omitempty"` + FollowersUrl string `json:"followers_url,omitempty"` + FollowingUrl string `json:"following_url,omitempty"` + GistsUrl string `json:"gists_url,omitempty"` + StarredUrl string `json:"starred_url,omitempty"` + SubscriptionsUrl string `json:"subscriptions_url,omitempty"` + OrganizationsUrl string `json:"organizations_url,omitempty"` + ReposUrl string `json:"repos_url,omitempty"` + EventsUrl string `json:"events_url,omitempty"` + ReceivedEventsUrl string `json:"received_events_url,omitempty"` + Type_ string `json:"type,omitempty"` + SiteAdmin string `json:"site_admin,omitempty"` + Permissions *ProjectMemberPermissionDetail `json:"permissions,omitempty"` } diff --git a/gitee/model_permission.go b/gitee/model_project_member_permission_detail.go similarity index 80% rename from gitee/model_permission.go rename to gitee/model_project_member_permission_detail.go index fce90c0..5ec14e8 100644 --- a/gitee/model_permission.go +++ b/gitee/model_project_member_permission_detail.go @@ -9,7 +9,8 @@ package gitee -type Permission struct { +type ProjectMemberPermissionDetail struct { Pull bool `json:"pull,omitempty"` Push bool `json:"push,omitempty"` + Admin bool `json:"admin,omitempty"` } -- Gitee From ebf02598ad1226c8458ee99ac80cab2a4aa55bf6 Mon Sep 17 00:00:00 2001 From: xwzQmxx <1499273991@qq.com> Date: Fri, 3 Dec 2021 10:41:16 +0800 Subject: [PATCH 3/3] fmt code --- gitee/model_project_member.go | 36 +++++++++---------- .../model_project_member_permission_detail.go | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gitee/model_project_member.go b/gitee/model_project_member.go index b37c5f0..0d0cd77 100644 --- a/gitee/model_project_member.go +++ b/gitee/model_project_member.go @@ -11,22 +11,22 @@ package gitee // 添加仓库成员 type ProjectMember struct { - Id int32 `json:"id,omitempty"` - Login string `json:"login,omitempty"` - Name string `json:"name,omitempty"` - AvatarUrl string `json:"avatar_url,omitempty"` - Url string `json:"url,omitempty"` - HtmlUrl string `json:"html_url,omitempty"` - FollowersUrl string `json:"followers_url,omitempty"` - FollowingUrl string `json:"following_url,omitempty"` - GistsUrl string `json:"gists_url,omitempty"` - StarredUrl string `json:"starred_url,omitempty"` - SubscriptionsUrl string `json:"subscriptions_url,omitempty"` - OrganizationsUrl string `json:"organizations_url,omitempty"` - ReposUrl string `json:"repos_url,omitempty"` - EventsUrl string `json:"events_url,omitempty"` - ReceivedEventsUrl string `json:"received_events_url,omitempty"` - Type_ string `json:"type,omitempty"` - SiteAdmin string `json:"site_admin,omitempty"` - Permissions *ProjectMemberPermissionDetail `json:"permissions,omitempty"` + Id int32 `json:"id,omitempty"` + Login string `json:"login,omitempty"` + Name string `json:"name,omitempty"` + AvatarUrl string `json:"avatar_url,omitempty"` + Url string `json:"url,omitempty"` + HtmlUrl string `json:"html_url,omitempty"` + FollowersUrl string `json:"followers_url,omitempty"` + FollowingUrl string `json:"following_url,omitempty"` + GistsUrl string `json:"gists_url,omitempty"` + StarredUrl string `json:"starred_url,omitempty"` + SubscriptionsUrl string `json:"subscriptions_url,omitempty"` + OrganizationsUrl string `json:"organizations_url,omitempty"` + ReposUrl string `json:"repos_url,omitempty"` + EventsUrl string `json:"events_url,omitempty"` + ReceivedEventsUrl string `json:"received_events_url,omitempty"` + Type_ string `json:"type,omitempty"` + SiteAdmin string `json:"site_admin,omitempty"` + Permissions *ProjectMemberPermissionDetail `json:"permissions,omitempty"` } diff --git a/gitee/model_project_member_permission_detail.go b/gitee/model_project_member_permission_detail.go index 5ec14e8..9d941c2 100644 --- a/gitee/model_project_member_permission_detail.go +++ b/gitee/model_project_member_permission_detail.go @@ -10,7 +10,7 @@ package gitee type ProjectMemberPermissionDetail struct { - Pull bool `json:"pull,omitempty"` - Push bool `json:"push,omitempty"` + Pull bool `json:"pull,omitempty"` + Push bool `json:"push,omitempty"` Admin bool `json:"admin,omitempty"` } -- Gitee