From a681c267b3498d22b777c54689bc6e6761117bac Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Thu, 18 Jan 2024 20:52:21 +0800 Subject: [PATCH] Refactor code format --- controllers/cert.go | 8 ++++---- controllers/organization.go | 21 ++++++++++----------- controllers/syncer.go | 4 ++-- controllers/user.go | 20 ++++++++++---------- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/controllers/cert.go b/controllers/cert.go index a2681663..1a7508a9 100644 --- a/controllers/cert.go +++ b/controllers/cert.go @@ -39,13 +39,13 @@ func (c *ApiController) GetCerts() { sortOrder := c.Input().Get("sortOrder") if limit == "" || page == "" { - maskedCerts, err := object.GetMaskedCerts(object.GetCerts(owner)) + certs, err := object.GetMaskedCerts(object.GetCerts(owner)) if err != nil { c.ResponseError(err.Error()) return } - c.ResponseOk(maskedCerts) + c.ResponseOk(certs) } else { limit := util.ParseInt(limit) count, err := object.GetCertCount(owner, field, value) @@ -80,13 +80,13 @@ func (c *ApiController) GetGlobalCerts() { sortOrder := c.Input().Get("sortOrder") if limit == "" || page == "" { - maskedCerts, err := object.GetMaskedCerts(object.GetGlobalCerts()) + certs, err := object.GetMaskedCerts(object.GetGlobalCerts()) if err != nil { c.ResponseError(err.Error()) return } - c.ResponseOk(maskedCerts) + c.ResponseOk(certs) } else { limit := util.ParseInt(limit) count, err := object.GetGlobalCertsCount(field, value) diff --git a/controllers/organization.go b/controllers/organization.go index 9468e3c0..802eca06 100644 --- a/controllers/organization.go +++ b/controllers/organization.go @@ -41,13 +41,12 @@ func (c *ApiController) GetOrganizations() { isGlobalAdmin := c.IsGlobalAdmin() if limit == "" || page == "" { - var maskedOrganizations []*object.Organization + var organizations []*object.Organization var err error - if isGlobalAdmin { - maskedOrganizations, err = object.GetMaskedOrganizations(object.GetOrganizations(owner)) + organizations, err = object.GetMaskedOrganizations(object.GetOrganizations(owner)) } else { - maskedOrganizations, err = object.GetMaskedOrganizations(object.GetOrganizations(owner, c.getCurrentUser().Owner)) + organizations, err = object.GetMaskedOrganizations(object.GetOrganizations(owner, c.getCurrentUser().Owner)) } if err != nil { @@ -55,15 +54,15 @@ func (c *ApiController) GetOrganizations() { return } - c.ResponseOk(maskedOrganizations) + c.ResponseOk(organizations) } else { if !isGlobalAdmin { - maskedOrganizations, err := object.GetMaskedOrganizations(object.GetOrganizations(owner, c.getCurrentUser().Owner)) + organizations, err := object.GetMaskedOrganizations(object.GetOrganizations(owner, c.getCurrentUser().Owner)) if err != nil { c.ResponseError(err.Error()) return } - c.ResponseOk(maskedOrganizations) + c.ResponseOk(organizations) } else { limit := util.ParseInt(limit) count, err := object.GetOrganizationCount(owner, field, value) @@ -93,13 +92,13 @@ func (c *ApiController) GetOrganizations() { // @router /get-organization [get] func (c *ApiController) GetOrganization() { id := c.Input().Get("id") - maskedOrganization, err := object.GetMaskedOrganization(object.GetOrganization(id)) + organization, err := object.GetMaskedOrganization(object.GetOrganization(id)) if err != nil { c.ResponseError(err.Error()) return } - c.ResponseOk(maskedOrganization) + c.ResponseOk(organization) } // UpdateOrganization ... @@ -190,8 +189,8 @@ func (c *ApiController) GetDefaultApplication() { return } - maskedApplication := object.GetMaskedApplication(application, userId) - c.ResponseOk(maskedApplication) + application = object.GetMaskedApplication(application, userId) + c.ResponseOk(application) } // GetOrganizationNames ... diff --git a/controllers/syncer.go b/controllers/syncer.go index 3dfeaf64..5557664a 100644 --- a/controllers/syncer.go +++ b/controllers/syncer.go @@ -40,13 +40,13 @@ func (c *ApiController) GetSyncers() { organization := c.Input().Get("organization") if limit == "" || page == "" { - organizationSyncers, err := object.GetOrganizationSyncers(owner, organization) + syncers, err := object.GetOrganizationSyncers(owner, organization) if err != nil { c.ResponseError(err.Error()) return } - c.ResponseOk(organizationSyncers) + c.ResponseOk(syncers) } else { limit := util.ParseInt(limit) count, err := object.GetSyncerCount(owner, organization, field, value) diff --git a/controllers/user.go b/controllers/user.go index c76c2f29..16be9a1d 100644 --- a/controllers/user.go +++ b/controllers/user.go @@ -39,13 +39,13 @@ func (c *ApiController) GetGlobalUsers() { sortOrder := c.Input().Get("sortOrder") if limit == "" || page == "" { - maskedUsers, err := object.GetMaskedUsers(object.GetGlobalUsers()) + users, err := object.GetMaskedUsers(object.GetGlobalUsers()) if err != nil { c.ResponseError(err.Error()) return } - c.ResponseOk(maskedUsers) + c.ResponseOk(users) } else { limit := util.ParseInt(limit) count, err := object.GetGlobalUserCount(field, value) @@ -90,22 +90,22 @@ func (c *ApiController) GetUsers() { if limit == "" || page == "" { if groupName != "" { - maskedUsers, err := object.GetMaskedUsers(object.GetGroupUsers(util.GetId(owner, groupName))) + users, err := object.GetMaskedUsers(object.GetGroupUsers(util.GetId(owner, groupName))) if err != nil { c.ResponseError(err.Error()) return } - c.ResponseOk(maskedUsers) + c.ResponseOk(users) return } - maskedUsers, err := object.GetMaskedUsers(object.GetUsers(owner)) + users, err := object.GetMaskedUsers(object.GetUsers(owner)) if err != nil { c.ResponseError(err.Error()) return } - c.ResponseOk(maskedUsers) + c.ResponseOk(users) } else { limit := util.ParseInt(limit) count, err := object.GetUserCount(owner, field, value, groupName) @@ -223,13 +223,13 @@ func (c *ApiController) GetUser() { } isAdminOrSelf := c.IsAdminOrSelf(user) - maskedUser, err := object.GetMaskedUser(user, isAdminOrSelf) + user, err = object.GetMaskedUser(user, isAdminOrSelf) if err != nil { c.ResponseError(err.Error()) return } - c.ResponseOk(maskedUser) + c.ResponseOk(user) } // UpdateUser @@ -541,13 +541,13 @@ func (c *ApiController) GetSortedUsers() { sorter := c.Input().Get("sorter") limit := util.ParseInt(c.Input().Get("limit")) - maskedUsers, err := object.GetMaskedUsers(object.GetSortedUsers(owner, sorter, limit)) + users, err := object.GetMaskedUsers(object.GetSortedUsers(owner, sorter, limit)) if err != nil { c.ResponseError(err.Error()) return } - c.ResponseOk(maskedUsers) + c.ResponseOk(users) } // GetUserCount