public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Avoid aliasing importing models in api package (#22492)

Browse Source
This commit is contained in:
Carl Bergquist
2020-03-04 12:57:20 +01:00
committed by GitHub
parent fcaff011b1
commit 3fdd2648b1
53 changed files with 910 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/org.go
+27 -27
View File
@@ -4,36 +4,36 @@ import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/metrics"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
)
// GET /api/org
func GetOrgCurrent(c *m.ReqContext) Response {
func GetOrgCurrent(c *models.ReqContext) Response {
return getOrgHelper(c.OrgId)
}
// GET /api/orgs/:orgId
func GetOrgByID(c *m.ReqContext) Response {
func GetOrgByID(c *models.ReqContext) Response {
return getOrgHelper(c.ParamsInt64(":orgId"))
}
// Get /api/orgs/name/:name
func GetOrgByName(c *m.ReqContext) Response {
query := m.GetOrgByNameQuery{Name: c.Params(":name")}
func GetOrgByName(c *models.ReqContext) Response {
query := models.GetOrgByNameQuery{Name: c.Params(":name")}
if err := bus.Dispatch(&query); err != nil {
if err == m.ErrOrgNotFound {
if err == models.ErrOrgNotFound {
return Error(404, "Organization not found", err)
}
return Error(500, "Failed to get organization", err)
}
org := query.Result
result := m.OrgDetailsDTO{
result := models.OrgDetailsDTO{
Id: org.Id,
Name: org.Name,
Address: m.Address{
Address: models.Address{
Address1: org.Address1,
Address2: org.Address2,
City: org.City,
@@ -47,10 +47,10 @@ func GetOrgByName(c *m.ReqContext) Response {
}
func getOrgHelper(orgID int64) Response {
query := m.GetOrgByIdQuery{Id: orgID}
query := models.GetOrgByIdQuery{Id: orgID}
if err := bus.Dispatch(&query); err != nil {
if err == m.ErrOrgNotFound {
if err == models.ErrOrgNotFound {
return Error(404, "Organization not found", err)
}
@@ -58,10 +58,10 @@ func getOrgHelper(orgID int64) Response {
}
org := query.Result
result := m.OrgDetailsDTO{
result := models.OrgDetailsDTO{
Id: org.Id,
Name: org.Name,
Address: m.Address{
Address: models.Address{
Address1: org.Address1,
Address2: org.Address2,
City: org.City,
@@ -75,14 +75,14 @@ func getOrgHelper(orgID int64) Response {
}
// POST /api/orgs
func CreateOrg(c *m.ReqContext, cmd m.CreateOrgCommand) Response {
func CreateOrg(c *models.ReqContext, cmd models.CreateOrgCommand) Response {
if !c.IsSignedIn || (!setting.AllowUserOrgCreate && !c.IsGrafanaAdmin) {
return Error(403, "Access denied", nil)
}
cmd.UserId = c.UserId
if err := bus.Dispatch(&cmd); err != nil {
if err == m.ErrOrgNameTaken {
if err == models.ErrOrgNameTaken {
return Error(409, "Organization name taken", err)
}
return Error(500, "Failed to create organization", err)
@@ -97,19 +97,19 @@ func CreateOrg(c *m.ReqContext, cmd m.CreateOrgCommand) Response {
}
// PUT /api/org
func UpdateOrgCurrent(c *m.ReqContext, form dtos.UpdateOrgForm) Response {
func UpdateOrgCurrent(c *models.ReqContext, form dtos.UpdateOrgForm) Response {
return updateOrgHelper(form, c.OrgId)
}
// PUT /api/orgs/:orgId
func UpdateOrg(c *m.ReqContext, form dtos.UpdateOrgForm) Response {
func UpdateOrg(c *models.ReqContext, form dtos.UpdateOrgForm) Response {
return updateOrgHelper(form, c.ParamsInt64(":orgId"))
}
func updateOrgHelper(form dtos.UpdateOrgForm, orgID int64) Response {
cmd := m.UpdateOrgCommand{Name: form.Name, OrgId: orgID}
cmd := models.UpdateOrgCommand{Name: form.Name, OrgId: orgID}
if err := bus.Dispatch(&cmd); err != nil {
if err == m.ErrOrgNameTaken {
if err == models.ErrOrgNameTaken {
return Error(400, "Organization name taken", err)
}
return Error(500, "Failed to update organization", err)
@@ -119,19 +119,19 @@ func updateOrgHelper(form dtos.UpdateOrgForm, orgID int64) Response {
}
// PUT /api/org/address
func UpdateOrgAddressCurrent(c *m.ReqContext, form dtos.UpdateOrgAddressForm) Response {
func UpdateOrgAddressCurrent(c *models.ReqContext, form dtos.UpdateOrgAddressForm) Response {
return updateOrgAddressHelper(form, c.OrgId)
}
// PUT /api/orgs/:orgId/address
func UpdateOrgAddress(c *m.ReqContext, form dtos.UpdateOrgAddressForm) Response {
func UpdateOrgAddress(c *models.ReqContext, form dtos.UpdateOrgAddressForm) Response {
return updateOrgAddressHelper(form, c.ParamsInt64(":orgId"))
}
func updateOrgAddressHelper(form dtos.UpdateOrgAddressForm, orgID int64) Response {
cmd := m.UpdateOrgAddressCommand{
cmd := models.UpdateOrgAddressCommand{
OrgId: orgID,
Address: m.Address{
Address: models.Address{
Address1: form.Address1,
Address2: form.Address2,
City: form.City,
@@ -149,9 +149,9 @@ func updateOrgAddressHelper(form dtos.UpdateOrgAddressForm, orgID int64) Respons
}
// GET /api/orgs/:orgId
func DeleteOrgByID(c *m.ReqContext) Response {
if err := bus.Dispatch(&m.DeleteOrgCommand{Id: c.ParamsInt64(":orgId")}); err != nil {
if err == m.ErrOrgNotFound {
func DeleteOrgByID(c *models.ReqContext) Response {
if err := bus.Dispatch(&models.DeleteOrgCommand{Id: c.ParamsInt64(":orgId")}); err != nil {
if err == models.ErrOrgNotFound {
return Error(404, "Failed to delete organization. ID not found", nil)
}
return Error(500, "Failed to update organization", err)
@@ -159,8 +159,8 @@ func DeleteOrgByID(c *m.ReqContext) Response {
return Success("Organization deleted")
}
func SearchOrgs(c *m.ReqContext) Response {
query := m.SearchOrgsQuery{
func SearchOrgs(c *models.ReqContext) Response {
query := models.SearchOrgsQuery{
Query: c.Query("query"),
Name: c.Query("name"),
Page: 0,