From f20f4d130baebdd1ffce841da8fb8614044e7a0a Mon Sep 17 00:00:00 2001
From: utkarshcmu <utkarsh.cmu@gmail.com>
Date: Tue, 8 Mar 2016 02:51:03 -0800
Subject: [PATCH] Pulled out the common code

---
 pkg/api/datasources.go | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go
index 2f0f1e3ad7c..8c57438dfb5 100644
--- a/pkg/api/datasources.go
+++ b/pkg/api/datasources.go
@@ -52,24 +52,9 @@ func GetDataSourceById(c *middleware.Context) Response {
 	}
 
 	ds := query.Result
+	dtos := convertModelToDtos(ds)
 
-	return Json(200, &dtos.DataSource{
-		Id:                ds.Id,
-		OrgId:             ds.OrgId,
-		Name:              ds.Name,
-		Url:               ds.Url,
-		Type:              ds.Type,
-		Access:            ds.Access,
-		Password:          ds.Password,
-		Database:          ds.Database,
-		User:              ds.User,
-		BasicAuth:         ds.BasicAuth,
-		BasicAuthUser:     ds.BasicAuthUser,
-		BasicAuthPassword: ds.BasicAuthPassword,
-		WithCredentials:   ds.WithCredentials,
-		IsDefault:         ds.IsDefault,
-		JsonData:          ds.JsonData,
-	})
+	return Json(200, &dtos)
 }
 
 func DeleteDataSource(c *middleware.Context) {
@@ -145,8 +130,13 @@ func GetDataSourceByName(c *middleware.Context) Response {
 	}
 
 	ds := query.Result
+	dtos := convertModelToDtos(ds)
+
+	return Json(200, &dtos)
+}
 
-	return Json(200, &dtos.DataSource{
+func convertModelToDtos(ds m.DataSource) dtos.DataSource {
+	return dtos.DataSource{
 		Id:                ds.Id,
 		OrgId:             ds.OrgId,
 		Name:              ds.Name,
@@ -162,5 +152,5 @@ func GetDataSourceByName(c *middleware.Context) Response {
 		WithCredentials:   ds.WithCredentials,
 		IsDefault:         ds.IsDefault,
 		JsonData:          ds.JsonData,
-	})
+	}
 }