Merge pull request grafana#3712 from schen59/master-schen

bergquist · bergquist · commit 8cf7fb7f8018 · 2016-01-13T08:40:44.000+01:00
add get org by name api (issue grafana#3600)
diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -147,6 +147,11 @@ func Register(r *macaron.Macaron) {
 			r.Put("/quotas/:target", bind(m.UpdateOrgQuotaCmd{}), wrap(UpdateOrgQuota))
 		}, reqGrafanaAdmin)
 
+		// orgs (admin routes)
+		r.Group("/orgs/name/:name", func() {
+			r.Get("/", wrap(GetOrgByName))
+		}, reqGrafanaAdmin)
+
 		// auth api keys
 		r.Group("/auth/keys", func() {
 			r.Get("/", wrap(GetApiKeys))
diff --git a/pkg/api/org.go b/pkg/api/org.go
@@ -20,6 +20,33 @@ func GetOrgById(c *middleware.Context) Response {
 	return getOrgHelper(c.ParamsInt64(":orgId"))
 }
 
+// Get /api/orgs/:name
+func GetOrgByName(c *middleware.Context) Response {
+	query := m.GetOrgByNameQuery{Name: c.Params(":name")}
+	if err := bus.Dispatch(&query); err != nil {
+		if err == m.ErrOrgNotFound {
+			return ApiError(404, "Organization not found", err)
+		}
+
+		return ApiError(500, "Failed to get organization", err)
+	}
+	org := query.Result
+	result := m.OrgDetailsDTO{
+		Id:   org.Id,
+		Name: org.Name,
+		Address: m.Address{
+			Address1: org.Address1,
+			Address2: org.Address2,
+			City:     org.City,
+			ZipCode:  org.ZipCode,
+			State:    org.State,
+			Country:  org.Country,
+		},
+	}
+
+	return Json(200, &result)
+}
+
 func getOrgHelper(orgId int64) Response {
 	query := m.GetOrgByIdQuery{Id: orgId}
 
